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