chiark / gitweb /
notation: strip word "merge" from \setmergeof etc.; use new definition of \commitmerg...