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