| commit | 44c36d1ccc9a40bfb31910dfd7e18d59fa8be502 | |
| author | Charles Bailey <charles@hashpling.org> | |
| Thu, 21 Feb 2008 23:30:02 +0000 (21 23:30 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Mar 2008 20:07:03 +0000 (5 12:07 -0800) | ||
| tree | 93467c94b6787d69537d9e9122483cc3e817dc61 | treesnapshot (tar.gz zip) |
| parent | 79b1138e7894ea048008f6b99908f5cd36e94949 | commitdiff |
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 <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/config.txt | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |