diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
| commit | 935a4783f72964e0fa72995c101542531081b094 (patch) | |
| tree | 415bf03a10403d26e6d383f0df2054880bdde654 /builtin/merge-index.c | |
| parent | Merge branch 'jb/diff-no-index-no-abbrev' into maint (diff) | |
| parent | difftool: fix dir-diff index creation when in a subdirectory (diff) | |
| download | tgif-935a4783f72964e0fa72995c101542531081b094.tar.xz | |
Merge branch 'da/difftool-dir-diff-fix' into maint
"git difftool --dir-diff" had a minor regression when started from
a subdirectory, which has been fixed.
* da/difftool-dir-diff-fix:
difftool: fix dir-diff index creation when in a subdirectory
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions