Changes since v6:
* Incorporated Junio's help and advice:
* Rebased v7 off of the correct v5 version.
* Signed off on Felipe's commit. (Although I have minor qualms with
Felipe's various wording and even the name of the flag it is
decidedly not worth burdening the list with bike-shedding.)
Changes since v5:
* Add per-tool configuration that Felipe has a "deep philosophical"
opposition to adding.
Felipe Contreras (1):
mergetool: add automerge configuration
Seth House (1):
mergetool: Add per-tool support for the autoMerge flag
Documentation/config/mergetool.txt | 6 ++++++
git-mergetool.sh | 20 ++++++++++++++++++++
t/t7610-mergetool.sh | 18 ++++++++++++++++++
3 files changed, 44 insertions(+)
--
2.29.2
