diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-02-08 13:36:03 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-02-08 13:36:03 -0800 |
commit | a83c2d2972b7821e45192df08142d27ebc51da48 (patch) | |
tree | 06647fcd34262da86bee65a45477fecccd579f22 /sha1-array.h | |
parent | e66adcadfe63508dfd7410c2253116043894d298 (diff) | |
parent | 853e10c19755669bd4695b1d9fd81f3278466727 (diff) | |
download | git-a83c2d2972b7821e45192df08142d27ebc51da48.tar.gz git-a83c2d2972b7821e45192df08142d27ebc51da48.tar.xz |
Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup
* da/difftool-dir-diff-fix:
difftool: fix dir-diff index creation when in a subdirectory
Diffstat (limited to 'sha1-array.h')
0 files changed, 0 insertions, 0 deletions