t7605: add a testcase demonstrating a bug with trivial merges