Doing octopus merge results:
$ git merge ...
Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d
Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28
Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7
Simple merge did not work, trying automatic merge.
...
SUGGESTION
Please announce the branch name being merged so that the listing is
easier to follow (possibly only with --verbose, -v option). Add
"Branch: <name>" just before the merge is attempted. somethiglike this
Branch: bug--manpage-fix-hyphen
Trying simple merge with c87c49b1e413e5dc378d7e6b16951761a1e82f6d
Branch: bug--manpage-fix-TH
Trying simple merge with b650c8c8809ef493ad4128fc941ed6b520c82f28
Branch: bug-manpage-change-binary-name
Trying simple merge with 047f83d6c8a08c4016004780e94257d9e487b7e6
Branch: feature--example.jwmrc-change-browser
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Branch: feature--example.jwmrc-change-clock
Trying simple merge with 16860b016e198acd0814492092e2ad5ea88fb219
Simple merge did not work, trying automatic merge.
Auto-merging example.jwmrc
Branch: feature--example.jwmrc-change-font
Trying simple merge with 9a397ff24a381ce49dd093c4f51c06c4c62f3ce7
Simple merge did not work, trying automatic merge.
...
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html