| commit | 88f90f8286e9e456ea332e00f87ad39892103544 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:38:22 +0000 (27 14:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Jun 2013 21:38:23 +0000 (27 14:38 -0700) | ||
| tree | adc94f5e7e6fa961ccfffb7197fc0df0b664e3a4 | treesnapshot (tar.gz zip) |
| parent | 6be17ec5828386c3ae17af26fac66f65f1c817ec | commitdiff |
| parent | 32eaf1de7f79c4ba09f3de3261c84e52e0a67af5 | commitdiff |
Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file