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