]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t4013/diff.show_--first-parent_master
Merge branch 'js/default-branch-name'
[thirdparty/git.git] / t / t4013 / diff.show_--first-parent_master
index 3dcbe473a0d2a7ac0b7f4243b610cff756d44759..94548f4598508f45e298e0ce07ef8146c6cfe256 100644 (file)
@@ -4,7 +4,7 @@ Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:04:00 2006 +0000
 
-    Merge branch 'side'
+    Merge branch 'side' into master
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644