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