merge: fix incorrect merge message for ambiguous tag/branch