summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_-p_-m_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.diff-tree_-p_-m_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.diff-tree_-p_-m_master')
-rw-r--r--t/t4013/diff.diff-tree_-p_-m_master4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4013/diff.diff-tree_-p_-m_master b/t/t4013/diff.diff-tree_-p_-m_master
index 1be721560a..b60bea039d 100644
--- a/t/t4013/diff.diff-tree_-p_-m_master
+++ b/t/t4013/diff.diff-tree_-p_-m_master
@@ -1,5 +1,5 @@
$ git diff-tree -p -m master
-176b998f5d647cbd77a9d8acf4531e930754d16d
+59d314ad6f356dd08601a4cd5e530381da3e3c64
diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644
--- a/dir/sub
@@ -21,7 +21,7 @@ index b414108..10a8a9f 100644
+A
+B
+C
-176b998f5d647cbd77a9d8acf4531e930754d16d
+59d314ad6f356dd08601a4cd5e530381da3e3c64
diff --git a/dir/sub b/dir/sub
index 7289e35..992913c 100644
--- a/dir/sub