Last active
June 7, 2020 06:46
-
-
Save roryokane/79b8ebcb3813ebd934c4 to your computer and use it in GitHub Desktop.
Comparison between Git diff algorithms: myers (default) vs. patience (example favors myers)
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/file.txt b/file.txt | |
| index 3299d68..accc3bd 100644 | |
| --- a/file.txt | |
| +++ b/file.txt | |
| @@ -1,7 +1,7 @@ | |
| +abc | |
| aaaaaa | |
| aaaaaa | |
| bbbbbb | |
| bbbbbb | |
| cccccc | |
| cccccc | |
| -abc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/file.txt b/file.txt | |
| index 3299d68..accc3bd 100644 | |
| --- a/file.txt | |
| +++ b/file.txt | |
| @@ -1,7 +1,7 @@ | |
| -aaaaaa | |
| -aaaaaa | |
| -bbbbbb | |
| -bbbbbb | |
| -cccccc | |
| -cccccc | |
| abc | |
| +aaaaaa | |
| +aaaaaa | |
| +bbbbbb | |
| +bbbbbb | |
| +cccccc | |
| +cccccc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| aaaaaa | |
| aaaaaa | |
| bbbbbb | |
| bbbbbb | |
| cccccc | |
| cccccc | |
| abc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| abc | |
| aaaaaa | |
| aaaaaa | |
| bbbbbb | |
| bbbbbb | |
| cccccc | |
| cccccc |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment