diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-27 01:08:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-27 01:08:02 -0800 |
| commit | 90b23e5f21e101f14da60375e4bda265a677e209 (patch) | |
| tree | effeccd13890741e6f0d5bafabd65be2c0d92551 /git-merge-resolve.sh | |
| parent | 5c415311f743ccb11a50f350ff1c385778f049d6 (diff) | |
| parent | b67b9612e1a90ae093445abeaeff930e9f4cf936 (diff) | |
| download | git-90b23e5f21e101f14da60375e4bda265a677e209.tar.gz git-90b23e5f21e101f14da60375e4bda265a677e209.tar.xz | |
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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions