view tests/test-merge5.out @ 1706:20b621154e17

Run commit message editor in the repo root (like hooks).
This makes the hgeditor script work with hg commit -R path/to/repo

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)