Search notes:
git merge-tree
Show three-way
merge
without touching
index
.
See also
git commands
Index