]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
Merge branch 'js/default-branch-name'
[thirdparty/git.git] / t / t4013 / diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
index 30aae7817b952d1088c872453a6a38a681fcd946..5f13a71bb53d5ee31c97ce527d3e8744cde57169 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
 
  dir/sub | 2 ++
  file0   | 3 +++