Merge branch 'th/difftool-diffall'
commitb18c74c92f53572896b6f98cf69fe08c65ae2455
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 03:56:17 +0000 (23 20:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jul 2012 03:56:17 +0000 (23 20:56 -0700)
tree46f2149caf3e00637216405a717fd4bb364a277f
parenta122c42e6fb5e8bd3b42634be50c4d48b2cb6599
parent05df532655e14ba351b4ee8a0acd8f190ed0b745
Merge branch 'th/difftool-diffall'

Finishing touches to difftool --dirdiff.

* th/difftool-diffall:
  difftool: only copy back files modified during directory diff