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