diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-05 16:33:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-05 16:33:50 -0700 |
| commit | 49b2788539016e7fd20559bea11b306ade0183b7 (patch) | |
| tree | 1ac5fc76c16feeafb1d7d564fe1b9ca48dd5379a /t/t4013/diff.diff_-r_initial..side | |
| parent | 0c926a3d9c34396636c2fea7a0cd5a4200ea298b (diff) | |
| parent | b319b02e2a75bfe71829cfe1506b86ec7644987d (diff) | |
| download | git-49b2788539016e7fd20559bea11b306ade0183b7.tar.gz git-49b2788539016e7fd20559bea11b306ade0183b7.tar.xz | |
Merge branch 'jc/diff-test'
* jc/diff-test:
t4013: add "diff" UI program tests.
Diffstat (limited to 't/t4013/diff.diff_-r_initial..side')
| -rw-r--r-- | t/t4013/diff.diff_-r_initial..side | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_-r_initial..side b/t/t4013/diff.diff_-r_initial..side new file mode 100644 index 000000000..5bb2fe2f2 --- /dev/null +++ b/t/t4013/diff.diff_-r_initial..side @@ -0,0 +1,32 @@ +$ git diff -r initial..side +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 +$ |