| commit | 2fc0c022e60f54be55d6065b9a8abccdc0f67bab | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Jun 2013 19:18:47 +0000 (6 12:18 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 6 Jun 2013 19:18:47 +0000 (6 12:18 -0700) | ||
| tree | d3d9bf5d28501b57fd4130c05f9da212c0784936 | treesnapshot (tar.gz zip) |
| parent | 5adb37410198bc1d2413df9100bfd5c9f5d844f2 | commitdiff |
| parent | 32eaf1de7f79c4ba09f3de3261c84e52e0a67af5 | commitdiff |
Merge branch 'ks/difftool-dir-diff-copy-fix'
"difftool --dir-diff" did not copy back changes made by the
end-user in the diff tool backend to the working tree in some
cases.
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file
"difftool --dir-diff" did not copy back changes made by the
end-user in the diff tool backend to the working tree in some
cases.
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file