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