Skip to content

Instantly share code, notes, and snippets.

@roryokane

roryokane/1 – myers (default) algorithm.diff

Last active January 31, 2025 15:52
Show Gist options
  • Save roryokane/79b8ebcb3813ebd934c4 to your computer and use it in GitHub Desktop.
Save roryokane/79b8ebcb3813ebd934c4 to your computer and use it in GitHub Desktop.
Download ZIP
Comparison between Git diff algorithms: myers (default) vs. patience (example favors myers)
Raw
1 – myers (default) algorithm.diff
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
Raw
2 – patience algorithm.diff
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
Raw
A – file before.txt
aaaaaa
aaaaaa
bbbbbb
bbbbbb
cccccc
cccccc
abc
Raw
B – file after.txt
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