summaryrefslogtreecommitdiff
path: root/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-02-15 00:03:43 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-15 00:03:43 -0800
commitb43174ebf12299ba3da3007c1e759613af153f6c (patch)
tree70768ba5fa6f9d8afda3486d57ff916a62c8530d /t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
parentMerge branch 'jc/branch-previous' (diff)
parentlog: do not print ellipses with --abbrev-commit (diff)
downloadtgif-b43174ebf12299ba3da3007c1e759613af153f6c.tar.xz
Merge branch 'tr/abbrev-commit-no-ellipses'
* tr/abbrev-commit-no-ellipses: log: do not print ellipses with --abbrev-commit
Diffstat (limited to 't/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master')
-rw-r--r--t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
index 10f6767e49..c0aff68ef6 100644
--- a/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
+++ b/t/t4013/diff.whatchanged_--root_-c_--patch-with-stat_--summary_master
@@ -1,6 +1,6 @@
$ git whatchanged --root -c --patch-with-stat --summary master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
-Merge: 9a6d494... c7a2ab9...
+Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:04:00 2006 +0000