diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-26 20:46:52 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 21:36:40 (GMT) |
| commit | 3c2f75b590c35675cc67dc43cabe2298bec86afc (patch) | |
| tree | 1197b6f0568d6aae04004be6e398320e8741604e /t/t4013/diff.diff-tree_--cc_master | |
| parent | 1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (diff) | |
| download | git-3c2f75b590c35675cc67dc43cabe2298bec86afc.zip git-3c2f75b590c35675cc67dc43cabe2298bec86afc.tar.gz git-3c2f75b590c35675cc67dc43cabe2298bec86afc.tar.bz2 | |
t4013: add tests for diff/log family output options.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_master')
| -rw-r--r-- | t/t4013/diff.diff-tree_--cc_master | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_master b/t/t4013/diff.diff-tree_--cc_master new file mode 100644 index 0000000..e57d943 --- /dev/null +++ b/t/t4013/diff.diff-tree_--cc_master @@ -0,0 +1,30 @@ +$ git diff-tree --cc master +176b998f5d647cbd77a9d8acf4531e930754d16d +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 +$ |