merge-recursive.c: fix case-changing merge bug