merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / RelNotes
index 5217e8e5543a696660e3f275d9717e0656d786f8..8c65931ff4d966ea7c76cdfa1fcb000c97ab1c19 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.7.2.3.txt
\ No newline at end of file
+Documentation/RelNotes/1.7.3.txt
\ No newline at end of file