merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / RelNotes
index c02235fe8cdd9900a1ce6430780b46e3ed84a45a..7f250ddc2efa8f8d3a46ccecb4d810695387798a 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.10.2.txt
\ No newline at end of file
+Documentation/RelNotes/2.11.1.txt
\ No newline at end of file