diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-27 09:08:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-27 09:08:02 (GMT) |
| commit | 90b23e5f21e101f14da60375e4bda265a677e209 (patch) | |
| tree | effeccd13890741e6f0d5bafabd65be2c0d92551 /t/t4030-diff-textconv.sh | |
| parent | 5c415311f743ccb11a50f350ff1c385778f049d6 (diff) | |
| parent | b67b9612e1a90ae093445abeaeff930e9f4cf936 (diff) | |
| download | git-90b23e5f21e101f14da60375e4bda265a677e209.zip git-90b23e5f21e101f14da60375e4bda265a677e209.tar.gz git-90b23e5f21e101f14da60375e4bda265a677e209.tar.bz2 | |
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo
This is an evil merge, as a test added since 1.6.0 expects an incorrect
behaviour the merged commit fixes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 2f27a0b..a3f0897 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 @@ |