Merging in the other direction, from "b" running "merge trunk", also ends with the file renamed but the new line lost.