git-merge-recursive: Trivial RE fixes.