difftool: only copy back files modified during directory diff
authorTim Henigan <tim.henigan@gmail.com>
Thu, 19 Jul 2012 08:27:09 +0000 (01:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Jul 2012 17:33:44 +0000 (10:33 -0700)
commit05df532655e14ba351b4ee8a0acd8f190ed0b745
tree5ce5e4b21605980b0b69f69d5abb9a689b6936c0
parent0ce2e396ee9fb0fa07e8381b338e49859dbf03db
difftool: only copy back files modified during directory diff

When 'difftool --dir-diff' is used to compare working tree files,
it always copies files from the tmp dir back to the working tree
when the diff tool is closed, even if the files were not modified
by the diff tool.

This causes the file timestamp to change. Files should only be
copied from the tmp dir back to the working copy if they were
actually modified.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-difftool.perl