git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 79b1138)
Tidy up git mergetool's backup file behaviour
authorCharles Bailey <redacted>
Thu, 21 Feb 2008 23:30:02 +0000 (23:30 +0000)
committerJunio C Hamano <redacted>
Wed, 5 Mar 2008 20:07:03 +0000 (12:07 -0800)
commit44c36d1ccc9a40bfb31910dfd7e18d59fa8be502
tree93467c94b6787d69537d9e9122483cc3e817dc61tree | snapshot
parent79b1138e7894ea048008f6b99908f5cd36e94949commit | diff
Tidy up git mergetool's backup file behaviour

Currently a backup pre-merge file with conflict markers is sometimes
kept with a .orig extenstion and sometimes removed depending on the
particular merge tool used.

This patch makes the handling consistent across all merge tools and
configurable via a new mergetool.keepBackup config variable

Signed-off-by: Charles Bailey <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/config.txt diff | blob | history
git-mergetool.sh diff | blob | history
git clone https://git.99rst.org/PROJECT