Correct handling of branch.$name.merge in builtin-fetch