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 /Documentation/fetch-options.txt | |
parent | GIT 1.6.1.1 (diff) | |
parent | diff.c: output correct index lines for a split diff (diff) | |
download | tgif-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 'Documentation/fetch-options.txt')
0 files changed, 0 insertions, 0 deletions