git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5adb374 32eaf1d)
Merge branch 'ks/difftool-dir-diff-copy-fix'
authorJunio C Hamano <redacted>
Thu, 6 Jun 2013 19:18:47 +0000 (12:18 -0700)
committerJunio C Hamano <redacted>
Thu, 6 Jun 2013 19:18:47 +0000 (12:18 -0700)
commit2fc0c022e60f54be55d6065b9a8abccdc0f67bab
treed3d9bf5d28501b57fd4130c05f9da212c0784936tree | snapshot
parent5adb37410198bc1d2413df9100bfd5c9f5d844f2commit | diff
parent32eaf1de7f79c4ba09f3de3261c84e52e0a67af5commit | diff
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
git clone https://git.99rst.org/PROJECT