| commit | b0169d84df4c09ed7dfcc6aea5aecd177ddda75b | |
| author | Charles Bailey <charles@hashpling.org> | |
| Fri, 12 Dec 2008 21:48:40 +0000 (12 21:48 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 13 Dec 2008 04:53:41 +0000 (12 20:53 -0800) | ||
| tree | 23feedda950856efb9230fc5bca5b32ced002063 | treesnapshot (tar.gz zip) |
| parent | 682b451f84c046aa5b082e89e3db62950cb6261a | commitdiff |
mergetool: Add prompt to continue after failing to merge a file
This option stops git mergetool from aborting at the first failed merge.
After a failed merge the user will be prompted to indicated whether he
wishes to continue with attempting to merge subsequent paths or to
abort.
This allows some additional use patterns. Merge conflicts can now be
previewed one at time and merges can also be skipped so that they can be
performed in a later pass.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This option stops git mergetool from aborting at the first failed merge.
After a failed merge the user will be prompted to indicated whether he
wishes to continue with attempting to merge subsequent paths or to
abort.
This allows some additional use patterns. Merge conflicts can now be
previewed one at time and merges can also be skipped so that they can be
performed in a later pass.
Signed-off-by: Charles Bailey <charles@hashpling.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool.sh | diffblobblamehistory |