diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-15 12:21:23 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-15 12:21:23 +0200 |
| commit | 7a77bde9448c15251cdcca14db20b7bf5c798692 (patch) | |
| tree | 4fa875f1fa57b01dcdfdb17d1b3ba2d0519bd493 /utils/diff/diff.go | |
| parent | 0b7d3fe0a47bd7da9c42ba34b9098441120bda02 (diff) | |
| parent | 345ffd95a2cd1413d7f48280e21a035febbe4e10 (diff) | |
| download | go-git-7a77bde9448c15251cdcca14db20b7bf5c798692.tar.gz | |
Merge branch 'master' of github.com:src-d/go-git into annotated
Diffstat (limited to 'utils/diff/diff.go')
| -rw-r--r-- | utils/diff/diff.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/diff/diff.go b/utils/diff/diff.go index b840ad6..f49ae55 100644 --- a/utils/diff/diff.go +++ b/utils/diff/diff.go @@ -16,8 +16,8 @@ import ( // string into the dst string. func Do(src, dst string) (diffs []diffmatchpatch.Diff) { dmp := diffmatchpatch.New() - wSrc, wDst, warray := dmp.DiffLinesToChars(src, dst) - diffs = dmp.DiffMain(wSrc, wDst, false) + wSrc, wDst, warray := dmp.DiffLinesToRunes(src, dst) + diffs = dmp.DiffMainRunes(wSrc, wDst, false) diffs = dmp.DiffCharsToLines(diffs, warray) return diffs } |