modify/delete conflict resolution overwrites untracked file
[gitweb.git] / RelNotes
index b9a53c3416991b66e1d35c2bbf663b48340b0041..ebf508f2d7ccb5b3c32dd298dfbfcd243a006947 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.0.txt
\ No newline at end of file
+Documentation/RelNotes-1.6.0.5.txt
\ No newline at end of file