git-gui: Give amend precedence to HEAD over MERGE_MSG