git/t/t4013/diff.show_master

$ git show master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date:   Mon Jun 26 00:04:00 2006 +0000

    Merge branch 'side'

diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub
+++ b/dir/sub
@@@ -1,6 -1,4 +1,8 @@@
  A
  B
 +C
 +D
 +E
 +F
+ 1
+ 2
diff --cc file0
index b414108,f4615da..10a8a9f
--- a/file0
+++ b/file0
@@@ -1,6 -1,6 +1,9 @@@
  1
  2
  3
 +4
 +5
 +6
+ A
+ B
+ C
$
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-27 04:46:52 +08:00			`$ git show master`
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> 2006-07-14 10:51:12 +08:00			`commit 59d314ad6f356dd08601a4cd5e530381da3e3c64`
log: do not print ellipses with --abbrev-commit 'git log --abbrev-commit' added an ellipsis to all commit names that were abbreviated. This was particularly annoying if you wanted to cut&paste the sha1 from the terminal, since selecting by word would pick up '...' too. So use find_unique_abbrev() instead of diff_unique_abbrev() in all log-related commit sha1 printing routines, and also change the formatting of the 'Merge: parent1 parent2' line output via pretty_print_commit(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-02-14 06:10:41 +08:00			`Merge: 9a6d494 c7a2ab9`
t4013: add tests for diff/log family output options. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-27 04:46:52 +08:00			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:04:00 2006 +0000`

			`Merge branch 'side'`

			`diff --cc dir/sub`
			`index cead32e,7289e35..992913c`
			`--- a/dir/sub`
			`+++ b/dir/sub`
			`@@@ -1,6 -1,4 +1,8 @@@`
			`A`
			`B`
			`+C`
			`+D`
			`+E`
			`+F`
			`+ 1`
			`+ 2`
			`diff --cc file0`
			`index b414108,f4615da..10a8a9f`
			`--- a/file0`
			`+++ b/file0`
			`@@@ -1,6 -1,6 +1,9 @@@`
			`1`
			`2`
			`3`
			`+4`
			`+5`
			`+6`
			`+ A`
			`+ B`
			`+ C`
			`$`