From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 21:38:22 +0000 (-0700)
Subject: Merge branch 'ks/difftool-dir-diff-copy-fix' into maint
X-Git-Tag: v1.8.3.2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88f90f8286e9e456ea332e00f87ad39892103544;p=git

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

88f90f8286e9e456ea332e00f87ad39892103544