diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-25 17:44:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-25 17:44:01 -0800 |
| commit | 9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3 (patch) | |
| tree | 5fd3aab2074522c1218848ec7b64a0bf59ed4196 /t | |
| parent | 48d6e97afe4dcce3bb01922b768cc4d831923e7f (diff) | |
| parent | 3ce8f08944e614813c7dfb212a88b7c4e3b443bc (diff) | |
| download | git-9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3.tar.gz git-9acf322d69f54ff5bf9de8b2d6f9cd1dccf523a3.tar.xz | |
Merge branch 'lt/diffgen' into next
* lt/diffgen:
built-in diff: minimum tweaks
builtin-diff: \No newline at end of file.
Use a *real* built-in diff generator
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4001-diff-rename.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 2e3c20d6b..08c11319a 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -49,7 +49,7 @@ rename from path0 rename to path1 --- a/path0 +++ b/path1 -@@ -8,7 +8,7 @@ Line 7 +@@ -8,7 +8,7 @@ Line 8 Line 9 Line 10 |