summaryrefslogtreecommitdiff
path: root/t/t2204-add-ignored.sh
diff options
context:
space:
mode:
authorLibravatar Tim Henigan <tim.henigan@gmail.com>2012-07-19 01:27:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-19 10:33:44 -0700
commit05df532655e14ba351b4ee8a0acd8f190ed0b745 (patch)
tree5ce5e4b21605980b0b69f69d5abb9a689b6936c0 /t/t2204-add-ignored.sh
parentGit 1.7.11 (diff)
downloadtgif-05df532655e14ba351b4ee8a0acd8f190ed0b745.tar.xz
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>
Diffstat (limited to 't/t2204-add-ignored.sh')
0 files changed, 0 insertions, 0 deletions