summaryrefslogtreecommitdiff
path: root/t/t4013/diff.whatchanged_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-07-13 19:51:12 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-13 21:40:43 -0700
commita40d384caca008c0334a35e9ac298f2eeb5decd2 (patch)
treef7bd59d2277de5ca9ae8c8304126f44e96c7b455 /t/t4013/diff.whatchanged_master
parentDisplay help for Git mode after pressing `h' or `?' in *git-status* (diff)
downloadtgif-a40d384caca008c0334a35e9ac298f2eeb5decd2.tar.xz
t4013 diff format tests update
This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.whatchanged_master')
-rw-r--r--t/t4013/diff.whatchanged_master6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4013/diff.whatchanged_master b/t/t4013/diff.whatchanged_master
index c22416c006..cd3bcc2c72 100644
--- a/t/t4013/diff.whatchanged_master
+++ b/t/t4013/diff.whatchanged_master
@@ -9,7 +9,7 @@ Date: Mon Jun 26 00:03:00 2006 +0000
:100644 100644 01e79c3... f4615da... M file0
:000000 100644 0000000... 7289e35... A file3
-commit 889b315013ef9f2e2f90aa0b054b267c8a557847
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
@@ -18,11 +18,13 @@ Date: Mon Jun 26 00:02:00 2006 +0000
:100644 100644 8422d40... cead32e... M dir/sub
:000000 100644 0000000... b1e6722... A file1
-commit 7952a93e09bf565b5592766a438b40cd81f4846f
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:01:00 2006 +0000
Second
+
+ This is the second commit.
:100644 100644 35d242b... 8422d40... M dir/sub
:100644 100644 01e79c3... b414108... M file0