diff options
| author |  Charles Bailey <charles@hashpling.org> | 2008-12-12 21:48:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-12-12 20:53:44 -0800 |
| commit | 162eba8b43a0e665c8e3439191981412815cc6db (patch) | |
| tree | 3c9a8f3e169479f02923b2c60f56215b07e83946 /git-gui/git-gui--askpass | |
| parent | mergetool: Add prompt to continue after failing to merge a file (diff) | |
| download | tgif-162eba8b43a0e665c8e3439191981412815cc6db.tar.xz | |
mergetool: Don't keep temporary merge files unless told to
This changes git mergetool to remove the temporary files used to invoke
the merge tool even if it returns non-zero.
This also adds a configuration option (mergetool.keepTemporaries) to
retain the previous behaviour if desired.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/git-gui--askpass')
0 files changed, 0 insertions, 0 deletions