Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
AgeCommit message (Expand)AuthorFilesLines
2018-08-27Bug 535802 - EPL 2.0 conversion for team bundlesLars Vogel1-3/+6
2018-07-06Reuse existing variableY20180712-0200I20180714-1500I20180713-2000I20180712-2000I20180711-2000I20180710-2000I20180709-2000I20180708-2000I20180707-1500I20180706-2000Mykola Nikishov1-1/+1
2018-07-06Use guard condition in TextMergeViewer's configureCompareFilterActionsMykola Nikishov1-81/+54
2018-07-05Bug 326103 - NPE when comparing two projectsI20180705-2000Mykola Nikishov1-6/+13
2018-07-05Bug 326103 - NPE when comparing two projectsMykola Nikishov1-16/+20
2018-03-29Bug 533040 - Use system cursorsAlexander Kurtakov1-13/+5
2017-07-24Revert "Bug 512395 - "Copy all from right to left" has no effect in some cases"I20170724-2000Andrey Loskutov1-7/+20
2017-07-20Bug 519977 - Modernize org.eclipse.compareAlexander Kurtakov1-137/+53
2017-03-03Cosmetics.I20170306-0800I20170305-2000I20170304-2000I20170303-2000Sergey Prigogin1-27/+26
2017-03-02Bug 512395 - "Copy all from right to left" has no effect in some casesAndrey Loskutov1-20/+7
2016-12-21Bug 509614 - Changes made in Compare editor are not saved when the leftSergey Prigogin1-2/+2
2016-11-04Bug 506732 - cleanup trailing spaces in compare pluginsY20161117-1000Y20161110-1000I20161122-2000I20161121-2000I20161120-2000I20161119-2000I20161118-2000I20161117-2000I20161116-2000I20161115-2000I20161114-2000I20161114-0355I20161113-2000I20161112-2000I20161112-0405I20161111-2000I20161111-1220I20161111-0900I20161111-0740I20161111-0510I20161110-2030I20161110-1630I20161110-1225I20161110-1130I20161110-0710I20161110-0510I20161109-2000I20161108-1015I20161108-0800Andrey Loskutov1-431/+431
2016-10-03Use Adapters.adapt method instead of homegrown equivalents.Sergey Prigogin1-11/+13
2016-08-30Bug 213780 - Compare With direction should be configurableConrad Groth1-141/+108
2016-07-20Fixed compiler warnings.Y20160804-1000Y20160728-1000Y20160721-1000I20160803-2000I20160803-0800I20160802-2000I20160802-0800I20160801-2000I20160801-0800I20160731-2000I20160726-1400I20160726-0800Sergey Prigogin1-180/+280
2016-03-22Bug 489805 - Move the team git repository to Java 1.8Stefan Xenos1-17/+11
2016-03-22Revert "Bug 489805 - Move the projects in the team git repository to Java 1.8"Dani Megert1-1/+1
2016-03-21Bug 489805 - Move the projects in the team git repository to Java 1.8I20160322-0800Stefan Xenos1-1/+1
2015-12-25Bug 336079 - "Show Line Numbers" menu in compare editor should beY20160310-0830Y20160310-0800Y20160303-0800I20160313-2000I20160308-0800I20160301-1230I20160301-0800I20160223-0800I20160216-1400I20160216-0800I20160209-0800I20160202-1000I20160202-0800I20160128-2000I20160127-2000I20160127-0800I20160126-2000I20160126-0800I20160125-2000I20160125-0800I20160125-0400I20160124-2000I20160119-0800I20160112-1800I20160112-0800I20160105-1000I20160105-0800I20151229-0800Tobias Melcher1-3/+13
2015-11-19Bug 448968 - NPE in ContentMergeViewer$ContentMergeViewerLayout.layoutI20151222-0800I20151215-0800I20151213-2000I20151209-2300I20151209-2000I20151209-0800I20151208-2000I20151208-0800I20151207-2000I20151207-0800I20151206-2000I20151203-1230I20151203-0800I20151201-1100I20151201-0800I20151124-1000I20151124-0800Stefan Xenos1-8/+11
2015-09-28Bug 200785: Find/Replace in compare editors does not support regular expressionsI20151029-1100I20151028-2000I20151028-0800I20151027-2000I20151027-0800I20151026-2000I20151026-0800I20151025-2000I20151020-0800I20151014-1100I20151013-0800I20151006-0800I20150929-0800Markus Keller1-1/+94
2015-09-02Bug 475427 - [compare] No syntax highlighting when IDocument is passedPascal Rapicault1-0/+1
2015-04-20Fixed bug 447565: Easy way to skip diff capping once when comparing a big doc...I20150504-2000I20150503-2000I20150502-1500I20150501-2000I20150430-1445I20150429-2000I20150429-1330I20150429-1230I20150429-1030I20150429-0800I20150428-2000I20150428-0800I20150428-0100I20150427-2000I20150427-0800I20150426-2000I20150422-1000I20150421-0800Markus Keller1-2/+8
2014-08-21Bug 399960 - [Edit] Make merge arrow buttons easier to hitRobin Stocker1-7/+8
2013-07-02Bug 405290 - Undo-ing to the point where the compare editor is not dirtyI20130702-1230I20130702-1000I20130702-0800Piotr Aniola1-3/+50
2013-05-08Fixed bug 407436: 'Overwrite' causes NPE in Compare editorI20130512-2000I20130511-1500I20130510-2000I20130509-2000I20130508-2000Dani Megert1-2/+4
2013-04-23Fixed bug 405290: Undo-ing to the point where the compare editor is not dirty...I20130430-0800I20130430-0031I20130429-2000I20130429-0800I20130428-2000Piotr Aniola1-2/+13
2013-04-15Bug 382427 - Mechanism to inject line compare strategies into merge andJeremy Flicker1-2/+154
2013-03-26Revert "Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work wh...Dani Megert1-13/+4
2013-02-28Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work whenv20130228-095449Piotr Aniola1-4/+13
2013-02-27Revert "Fixed bug 309124: [compare] Java Source Compare does not show whitesp...I20130227-2000Dani Megert1-115/+96
2013-02-20Fixed bug 309124: [compare] Java Source Compare does not show whitespaceI20130224-2000I20130223-1500I20130222-2000Manju Mathew1-96/+115
2013-02-04[Edit] Enable center arrow buttons when editable and for both sidesv20130204-150810I20130205-0800Robin Stocker1-36/+85
2011-10-13bug 359032: Move plugins under bundles/org.eclipse.compare/plugins/ toTomasz Zarna1-0/+5327
2008-07-16Bug 207704 Decouple org.eclipse.compare from UIMichael Valenta1-4515/+0
2008-04-21bug 227585: TextMergeViewer.isCurrentDiff(Diff) leaks a non-API typeTomasz Zarna1-2/+2
2008-02-28bug 217070: [Apply Patch] Show matched hunks in Apply Patch wizardTomasz Zarna1-4/+14
2007-09-19Bug 202944 [Viewers] Please provide an "auto-merge" button in the text and ja...Michael Valenta1-1300/+310
2007-08-01Updated copyrights for 3rd party contributionsMichael Valenta1-0/+1
2007-08-01Bug 178968 [Viewers] Lines scrambled and different font size in compareMichael Valenta1-5/+7
2007-07-18Bug 191524 [Viewers] Synchronize horizontal scrolling by # characters, not % ...Michael Valenta1-12/+5
2007-05-07Bug 179049 [Edit] Comparing .txt files and then .java files from archives log...Michael Valenta1-5/+8
2007-04-27Bug 184489 NPE when I open the compare editorMichael Valenta1-6/+13
2007-04-24Bug 91236 [Viewers] The ">" center button in TextMergeViewer alway copy diff ...Michael Valenta1-4/+8
2007-04-24Bug 182298 Compare editor only notices the first SAVE action for text filesMichael Valenta1-0/+4
2007-04-23Bug 175254 Move "Ignore White Space Where Applicable" toolbar button to merge...Michael Valenta1-10/+7
2007-04-20Bug 175254 Move "Ignore White Space Where Applicable" toolbar button to merge...Michael Valenta1-0/+14
2007-04-19Bug 182287 compare editors open separate Find/Replace dialogs and don't follo...Michael Valenta1-15/+71
2007-04-18Bug 183014 Failure in Nightly buildMichael Valenta1-1/+2
2007-04-17Bug 182287 compare editors open separate Find/Replace dialogs and don't follo...Michael Valenta1-13/+4

Back to the top