diff options
Diffstat (limited to 't/t4013/diff.log_--root_master')
-rw-r--r-- | t/t4013/diff.log_--root_master | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master index e8f46159da..db56b1fe6b 100644 --- a/t/t4013/diff.log_--root_master +++ b/t/t4013/diff.log_--root_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 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Author: A U Thor <author@example.com> |