| commit | 288e6ff5a64331e5da1dd9d978938b44d50f5be9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Apr 2013 16:34:09 +0000 (3 09:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Apr 2013 16:34:09 +0000 (3 09:34 -0700) | ||
| tree | 9839dd834ffd0070a8493a5e78205d5b805ec21b | treesnapshot (tar.gz zip) |
| parent | f30366b27a91dbc18328bccf3067cdfad4f0cfbc | commitdiff |
| parent | e01afdb74b395e63a6ee8feb8cb3a6ee470e2085 | commitdiff |
Merge branch 'jk/difftool-no-overwrite-on-copyback'
Try to be careful when difftool backend allows the user to write
into the temporary files being shown *and* the user makes changes
to the working tree at the same time. One of the changes has to be
lost in such a case, but at least tell the user what he did.
* jk/difftool-no-overwrite-on-copyback:
t7800: run --dir-diff tests with and without symlinks
t7800: fix tests when difftool uses --no-symlinks
t7800: don't hide grep output
difftool: don't overwrite modified files
t7800: move '--symlinks' specific test to the end
Try to be careful when difftool backend allows the user to write
into the temporary files being shown *and* the user makes changes
to the working tree at the same time. One of the changes has to be
lost in such a case, but at least tell the user what he did.
* jk/difftool-no-overwrite-on-copyback:
t7800: run --dir-diff tests with and without symlinks
t7800: fix tests when difftool uses --no-symlinks
t7800: don't hide grep output
difftool: don't overwrite modified files
t7800: move '--symlinks' specific test to the end