diff options
| author |  Charles Bailey <charles@hashpling.org> | 2008-02-21 23:30:02 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-05 12:07:03 -0800 |
| commit | 44c36d1ccc9a40bfb31910dfd7e18d59fa8be502 (patch) | |
| tree | 93467c94b6787d69537d9e9122483cc3e817dc61 /test-delta.c | |
| parent | fsck.c: fix bogus "empty tree" check (diff) | |
| download | tgif-44c36d1ccc9a40bfb31910dfd7e18d59fa8be502.tar.xz | |
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>
Diffstat (limited to 'test-delta.c')
0 files changed, 0 insertions, 0 deletions