From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Jun 2013 19:18:47 +0000 (-0700)
Subject: Merge branch 'ks/difftool-dir-diff-copy-fix'
X-Git-Tag: v1.8.4-rc0~203
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2fc0c022e60f54be55d6065b9a8abccdc0f67bab;p=git-core%2Fgit.git

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
---

2fc0c022e60f54be55d6065b9a8abccdc0f67bab