merge-tree: handle directory/empty conflict correctly
[gitweb.git] / RelNotes
index ad613ead7bfedefeca6e3e49bc0ba9349702aa44..3c65929a74433601bc2d271657aa8d0c26974782 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/1.8.1.4.txt
\ No newline at end of file
+Documentation/RelNotes/1.8.1.5.txt
\ No newline at end of file