Fixed issue #913: Merge does not cope with ambiguous tag and branch names