Merge branch 'jk/log-fp-implies-m'

[thirdparty/git.git] / t / t4013 / diff.log_-p_--first-parent_master

diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index fe044399f04ecc672340b405ae807a976b1c8fb6..28840ebea1e33a41402b392833093df2e92f8035 100644 (file)
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@ -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' into master
+    Merge branch 'side'
 
 diff --git a/dir/sub b/dir/sub
 index cead32e..992913c 100644