diff options
| author | Stefan Lay | 2010-09-07 10:09:56 +0000 |
|---|---|---|
| committer | Code Review | 2010-09-07 10:09:56 +0000 |
| commit | 1d50df98790106e3c20a8f4e1fb2f681a2043b98 (patch) | |
| tree | 987da5030b24c458972b98767552205838551a01 /org.eclipse.egit.ui | |
| parent | ab862b0af13a6ba83f956746ee170e618488f92a (diff) | |
| parent | 8df19d1464d6cb2087429585b932562803c21a7c (diff) | |
| download | egit-1d50df98790106e3c20a8f4e1fb2f681a2043b98.tar.gz egit-1d50df98790106e3c20a8f4e1fb2f681a2043b98.tar.xz egit-1d50df98790106e3c20a8f4e1fb2f681a2043b98.zip | |
Merge "Use default RawTextComparator to compute Myers diff"
Diffstat (limited to 'org.eclipse.egit.ui')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java index 811e331606..5c678e56b2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/FileDiff.java @@ -21,10 +21,11 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jgit.diff.DiffEntry; +import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.diff.MyersDiff; import org.eclipse.jgit.diff.RawText; -import org.eclipse.jgit.diff.DiffEntry.ChangeType; +import org.eclipse.jgit.diff.RawTextComparator; import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.MissingObjectException; @@ -152,7 +153,7 @@ class FileDiff { final RawText a = getRawText(id1, reader); final RawText b = getRawText(id2, reader); - final MyersDiff diff = new MyersDiff(a, b); + final MyersDiff diff = new MyersDiff(RawTextComparator.DEFAULT, a, b); diffFmt.format(diff.getEdits(), a, b); } |