xdiff-merge: optionally show conflicts in "diff3 -m" style
[gitweb.git] / RelNotes
index e13dbd4f9fa071eb6b6dfba591d4e4f4fb6fef95..8f32997335aab2ba3d8c2eee2af8fe745dae5fcc 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.4.5.txt
\ No newline at end of file
+Documentation/RelNotes-1.6.0.1.txt
\ No newline at end of file