Vegard Nossum <vegard.nossum@xxxxxxxxxx> writes: > Add --ours and --theirs to view the commits from > > $(git merge-base HEAD MERGE_HEAD)..HEAD and > $(git merge-base HEAD MERGE_HEAD)..MERGE_HEAD The range you wrote with "merge-base" would not work well, when there are multiple merge bases between HEAD and MERGE_HEAD. Just saying MERGE_HEAD..HEAD and HEAD..MERGE_HEAD or even simpler, saying MERGE_HEAD.. and ..MERGE_HEAD would be sufficient, simpler, and more importantly, more correct.
