[trash (branch2)]$ git log -p
commit af2d3e05473573e7f40d6f5df5e0c024296eff7c
Author: D <author@example.com>
Date: Wed Mar 7 00:27:40 2007 +0000
edit
diff --git a/file b/file
index b94e4a0..8268f8a 100644
--- a/file
+++ b/file
@@ -1,8 +1,7 @@
-1A quick brown fox jumps over the
lazy dog
4A quick brown lazy dog fox jumps over the
lazy dog
-3A slow green fox jumps into the
+99 slow green fox jumps into the
well.
evil merge.
-incomplete
\ No newline at end of file
+incomplete
commit 144c1b2c7c6e5ad44f7d336e0ac09bf6e7a4b86f
Author: C <author@example.com>
Date: Wed Mar 7 00:27:39 2007 +0000
Incomplete
diff --git a/file b/file
index ca2cad0..b94e4a0 100644
--- a/file
+++ b/file
@@ -5,3 +5,4 @@ lazy dog
3A slow green fox jumps into the
well.
evil merge.
+incomplete
\ No newline at end of file
commit 0e19b8f388b718ea185f691c2d293a6e13813862
Merge: f4b6b4d... 9c39bd5...
Author: A U Thor <author@example.com>
Date: Wed Mar 7 00:27:37 2007 +0000
Merge branch 'branch1' into branch2
commit f4b6b4d9768312a8109286a38fff057f1e114edc
Author: B2 <author@example.com>
Date: Wed Mar 7 00:27:36 2007 +0000
Branch2-1
diff --git a/file b/file
index 39231da..f7d7a07 100644
--- a/file
+++ b/file
@@ -1,4 +1,4 @@
1A quick brown fox jumps over the
lazy dog
-2A quick brown fox jumps over the
+4A quick brown lazy dog fox jumps over the
lazy dog
commit 9c39bd523b727c88310311147ca660c2171052f6
Author: B1 <author@example.com>
Date: Wed Mar 7 00:27:35 2007 +0000
Branch1-1
diff --git a/file b/file
index 39231da..381da18 100644
--- a/file
+++ b/file
@@ -2,3 +2,5 @@
lazy dog
2A quick brown fox jumps over the
lazy dog
+3A slow green fox jumps into the
+well.
commit 52bd1d4d119fecbb990362df82d2c3adb42bd39c
Author: B <author@example.com>
Date: Wed Mar 7 00:27:34 2007 +0000
Second.
diff --git a/file b/file
index 42094af..39231da 100644
--- a/file
+++ b/file
@@ -1,2 +1,4 @@
1A quick brown fox jumps over the
lazy dog
+2A quick brown fox jumps over the
+lazy dog
commit 9f1156b50b3de984050a4cd4ed3c656177490f00
Author: A <author@example.com>
Date: Wed Mar 7 00:27:33 2007 +0000
Initial.
diff --git a/file b/file
new file mode 100644
index 0000000..42094af
--- /dev/null
+++ b/file
@@ -0,0 +1,2 @@
+1A quick brown fox jumps over the
+lazy dog