diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-01 22:02:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-01 22:02:17 -0700 |
| commit | b319b02e2a75bfe71829cfe1506b86ec7644987d (patch) | |
| tree | 4cc45459e3f2c0ccad94fe44f4c09ea220555adf /t/t4013/diff.diff_--patch-with-raw_-r_initial..side | |
| parent | t4013: add format-patch tests. (diff) | |
| download | tgif-b319b02e2a75bfe71829cfe1506b86ec7644987d.tar.xz | |
t4013: add "diff" UI program tests.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013/diff.diff_--patch-with-raw_-r_initial..side')
| -rw-r--r-- | t/t4013/diff.diff_--patch-with-raw_-r_initial..side | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_--patch-with-raw_-r_initial..side b/t/t4013/diff.diff_--patch-with-raw_-r_initial..side new file mode 100644 index 0000000000..3590dc79a6 --- /dev/null +++ b/t/t4013/diff.diff_--patch-with-raw_-r_initial..side @@ -0,0 +1,36 @@ +$ git diff --patch-with-raw -r initial..side +:100644 100644 35d242b... 7289e35... M dir/sub +:100644 100644 01e79c3... f4615da... M file0 +:000000 100644 0000000... 7289e35... A file3 + +diff --git a/dir/sub b/dir/sub +index 35d242b..7289e35 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++1 ++2 +diff --git a/file0 b/file0 +index 01e79c3..f4615da 100644 +--- a/file0 ++++ b/file0 +@@ -1,3 +1,6 @@ + 1 + 2 + 3 ++A ++B ++C +diff --git a/file3 b/file3 +new file mode 100644 +index 0000000..7289e35 +--- /dev/null ++++ b/file3 +@@ -0,0 +1,4 @@ ++A ++B ++1 ++2 +$ |