diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:33 -0800 |
commit | afe0e2a391665c01daae78d8f8a9a105420b0218 (patch) | |
tree | ea929bc1bdaff887cf0df53e102bec6979162e14 /unix-socket.c | |
parent | c89606fa9043910c5f467eb0d152df1c463710be (diff) | |
parent | 853e10c19755669bd4695b1d9fd81f3278466727 (diff) | |
download | git-afe0e2a391665c01daae78d8f8a9a105420b0218.tar.gz git-afe0e2a391665c01daae78d8f8a9a105420b0218.tar.xz |
Merge branch 'da/difftool-dir-diff-fix'
"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 'unix-socket.c')
0 files changed, 0 insertions, 0 deletions