bug 1034: sigh undo damage caused by rebase merge