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

Junio C Hamano committed Jun 27, 2013 at 14:38 UTC 88f90f8286e9e456ea332e00f87ad39892103544

No changes.