Junio C Hamano 78a26cb720 Merge branch 'sh/mergetool-hideresolved' ...

"git mergetool" feeds three versions (base, local and remote) of
a conflicted path unmodified.  The command learned to optionally
prepare these files with unconflicted parts already resolved.

* sh/mergetool-hideresolved:
  mergetool: add per-tool support and overrides for the hideResolved flag
  mergetool: break setup_tool out into separate initialization function
  mergetool: add hideResolved configuration

2021-02-17 17:21:41 -08:00

9.5 KiB

Raw Blame History

View Raw