projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa2d3db 9d9cf23)
Merge branch 'sh/mergetool-hideresolved'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Feb 2021 01:21:41 +0000 (17:21 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Feb 2021 01:21:41 +0000 (17:21 -0800)
commit78a26cb7204ddb96a5f75f09e41fbefd81c85f59
tree712a759422ee38d5e4d4a49720a532f96833a3e3tree | snapshot
parentaa2d3dbdf56e835e34c8255815019bcfee5066d2commit | diff
parent9d9cf230317f7fe7cb153f61b537e6e9bef22e3bcommit | diff
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
git-mergetool--lib.sh diff1 | diff2 | blob | history
t/t7610-mergetool.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.