| 1 |
$ git show --first-parent master |
| 2 |
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 |
| 3 |
Merge: 9a6d494 c7a2ab9 |
| 4 |
Author: A U Thor <[email protected]> |
| 5 |
Date: Mon Jun 26 00:04:00 2006 +0000 |
| 6 |
|
| 7 |
Merge branch 'side' |
| 8 |
|
| 9 |
diff --git a/dir/sub b/dir/sub |
| 10 |
index cead32e..992913c 100644 |
| 11 |
--- a/dir/sub |
| 12 |
+++ b/dir/sub |
| 13 |
@@ -4,3 +4,5 @@ C |
| 14 |
D |
| 15 |
E |
| 16 |
F |
| 17 |
+1 |
| 18 |
+2 |
| 19 |
diff --git a/file0 b/file0 |
| 20 |
index b414108..10a8a9f 100644 |
| 21 |
--- a/file0 |
| 22 |
+++ b/file0 |
| 23 |
@@ -4,3 +4,6 @@ |
| 24 |
4 |
| 25 |
5 |
| 26 |
6 |
| 27 |
+A |
| 28 |
+B |
| 29 |
+C |
| 30 |
$ |