]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'da/difftool-dir-diff-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (14:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Dec 2016 22:45:33 +0000 (14:45 -0800)
commitafe0e2a391665c01daae78d8f8a9a105420b0218
treeea929bc1bdaff887cf0df53e102bec6979162e14
parentc89606fa9043910c5f467eb0d152df1c463710be
parent853e10c19755669bd4695b1d9fd81f3278466727
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