diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-06-27 15:36:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-27 15:36:19 -0700 |
| commit | 9e76bab14e50c46c624ae35f13c527a7a1b1185d (patch) | |
| tree | 499593788428c17315928abd9c9159517d4e995a /t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | |
| parent | t4013: add more tests around -c and --cc (diff) | |
| download | tgif-9e76bab14e50c46c624ae35f13c527a7a1b1185d.tar.xz | |
t4013 test updates for new output code.
These are updates to the test vector that shows the "incompatibility" of
the new output code. The changes are actually the good ones, so instead
of keeping the older output we adjust the test to the new code.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master')
| -rw-r--r-- | t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master index fafd9ee59e..b652c6a823 100644 --- a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master +++ b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master @@ -5,12 +5,11 @@ Author: A U Thor <author@example.com> Date: Mon Jun 26 00:04:00 2006 +0000 Merge branch 'side' ---- + dir/sub | 2 ++ file0 | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) - diff --cc dir/sub index cead32e,7289e35..992913c --- a/dir/sub |