Andrew's git / gitweb.git / blobdiff
?
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
[gitweb.git] / RelNotes
diff --git a/RelNotes b/RelNotes
index 46308cee0ba1ca2cf7d7d9c3de6abafe20c1493f..8f32997335aab2ba3d8c2eee2af8fe745dae5fcc 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.4.txt
\ No newline at end of file
+Documentation/RelNotes-1.6.0.1.txt
\ No newline at end of file