Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
authorJunio C Hamano <redacted>
Thu, 27 Jun 2013 21:38:22 +0000 (14:38 -0700)
committerJunio C Hamano <redacted>
Thu, 27 Jun 2013 21:38:23 +0000 (14:38 -0700)
commit88f90f8286e9e456ea332e00f87ad39892103544
treeadc94f5e7e6fa961ccfffb7197fc0df0b664e3a4
parent6be17ec5828386c3ae17af26fac66f65f1c817ec
parent32eaf1de7f79c4ba09f3de3261c84e52e0a67af5
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
git clone https://git.99rst.org/PROJECT