am -3: do not let failed merge from completing the error codepath
[gitweb.git] / RelNotes
index 8ee12bf8a31a83289e4be3b0bbba88b5775ac7c9..def6ebd43038cd537c2e34617d479d48cc40361c 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.7.12.2.txt
\ No newline at end of file
+Documentation/RelNotes/2.6.1.txt
\ No newline at end of file