git-merge documentation: describe how conflict is presented

diff --git a/Documentation/RelNotes-1.5.4.5.txt b/Documentation/RelNotes-1.5.4.5.txt
index fe768d497ff2f8a5b9edb3d1a25483170fcdd554..bbd130e36d411e70f7c3b3b4fcfe531d383e9f0e 100644 (file)
--- a/Documentation/RelNotes-1.5.4.5.txt
+++ b/Documentation/RelNotes-1.5.4.5.txt
@@ -4,6 +4,13 @@ GIT v1.5.4.5 Release Notes
 Fixes since v1.5.4.4
 --------------------
 
+ * "git fetch there" when the URL information came from the Cogito style
+   branches/there file did not update refs/heads/there (regression in
+   1.5.4).
+
+ * Bogus refspec configuration such as "remote.there.fetch = =" were not
+   detected as errors (regression in 1.5.4).
+
  * You couldn't specify a custom editor whose path contains a whitespace
    via GIT_EDITOR (and core.editor).
 
@@ -46,8 +53,4 @@ Fixes since v1.5.4.4
  * "git rebase -m" triggered pre-commit verification, which made
    "rebase --continue" impossible.
 
---
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.5.4.4-25-ga6f7728
-git shortlog --no-merges $O..maint
+As usual, it also comes with many documentation fixes and clarifications.