Charles Bailey [off-list ref] writes:
This option stops git mergetool from aborting at the first failed merge.
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.
Hmm, with this command line:
-'git mergetool' [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>]...
I wonder why this even needs to be an option. If you do not want to
resolve all of them, you can limit the amount of work you would do by
giving list of paths to work on, can't you?