merge-recursive: Avoid doubly merging rename/add conflict contents

diff --git a/RelNotes b/RelNotes
index 028ad79e1f7226088102667085ca5ceb43c4d442..8c65931ff4d966ea7c76cdfa1fcb000c97ab1c19 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.7.2.2.txt
\ No newline at end of file
+Documentation/RelNotes/1.7.3.txt
\ No newline at end of file