diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-31 18:07:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-31 18:07:42 -0800 |
| commit | bdf6442b482e488fd34b2d749316312e0ee25a5b (patch) | |
| tree | ab61dfcc3a9eecbf4a55af9e2c48b696a40ef510 /t/t4030-diff-textconv.sh | |
| parent | ed096c4a23476810831e12d2e9227403c21bd774 (diff) | |
| parent | 90b23e5f21e101f14da60375e4bda265a677e209 (diff) | |
| download | git-bdf6442b482e488fd34b2d749316312e0ee25a5b.tar.gz | |
Merge branch 'jc/maint-split-diff-metainfo'
* jc/maint-split-diff-metainfo:
diff.c: output correct index lines for a split diff
Diffstat (limited to 't/t4030-diff-textconv.sh')
| -rwxr-xr-x | t/t4030-diff-textconv.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh index 2f27a0ba9e..a3f0897a52 100755 --- a/t/t4030-diff-textconv.sh +++ b/t/t4030-diff-textconv.sh @@ -104,7 +104,7 @@ cat >expect.typechange <<'EOF' -1 diff --git a/file b/file new file mode 120000 -index ad8b3d2..67be421 +index 0000000..67be421 --- /dev/null +++ b/file @@ -0,0 +1 @@ |