| commit | ca0cae0ef69829786d5dea80f923c4005d024c3a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Jun 2013 20:16:55 +0000 (3 13:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 3 Jun 2013 20:16:55 +0000 (3 13:16 -0700) | ||
| tree | 228dfd26b52489dda9b3ff7fa3f2ebdfdd1edad7 | treesnapshot (tar.gz zip) |
| parent | 00847ea14c550f947f3c78a20b3fb98b999ef28d | commitdiff |
| parent | 32eaf1de7f79c4ba09f3de3261c84e52e0a67af5 | commitdiff |
Merge branch 'ks/difftool-dir-diff-copy-fix' into next
"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