Seth House wrote:
> Disabling may be desirable if the mergetool wants or needs access to the
> original, unmodified 'LOCAL', 'REMOTE', and 'BASE' versions of the
> conflicted file. For example:
>
> - A tool may use a custom conflict resolution algorithm and prefer to
> ignore the results of Git's conflict resolution.
If git's conflict resolution decides there are no conflicts, how would
such tool "ignore" that?
> - A tool may want to visually compare/constrast the version of the file
> from before the merge (saved to 'LOCAL', 'REMOTE', and 'BASE') with
> Git's conflict resolution results (saved to 'MERGED').
Can't such tool use "git checkout-index" for that?
> - A student or researcher working on a new algorithm may want to
> directly compare the result of that algorithm with the result of Git's
> algorithm.
1. If git's algorithm decides there are no conflicts, and the new
algorithm decides there are conflicts, how would such researcher
find that out?
2. Can't such researcher simply do:
git -c mergetool.automerge=false mergetool?
Cheers.
--
Felipe Contreras
