summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_-p_--first-parent_master
diff options
context:
space:
mode:
Diffstat (limited to 't/t4013/diff.log_-p_--first-parent_master')
-rw-r--r--t/t4013/diff.log_-p_--first-parent_master2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index 3fc896d424..c6a5876d80 100644
--- 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'
+ Merge branch 'side' into master
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>