Andrew's git / gitweb.git / diff
?
Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:22 +0000 (14:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jun 2013 21:38:23 +0000 (14:38 -0700)
* ks/difftool-dir-diff-copy-fix:
difftool --dir-diff: allow changing any clean working tree file

Trivial merge