rerere: handle conflicts with multiple stage #1 entries
[gitweb.git] / RelNotes
index dfc0e738d9198a8b9a85ed3c8b1f621f71b32f25..159d09e820af9b9156d60d6213b9760c3712befc 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.8.5.txt
\ No newline at end of file
+Documentation/RelNotes/2.3.8.txt
\ No newline at end of file