merge-recursive: demonstrate an incorrect conflict with submodule

diff --git a/Documentation/RelNotes-1.6.5.txt b/Documentation/RelNotes-1.6.5.txt
index 636e226a3705f06575c4dc2825c3f7d40f1d0242..ee141c19add21c463d076e994ee68704eb13ba55 100644 (file)
--- a/Documentation/RelNotes-1.6.5.txt
+++ b/Documentation/RelNotes-1.6.5.txt
@@ -167,9 +167,3 @@ Fixes since v1.6.4
 
 All of the fixes in v1.6.4.X maintenance series are included in this
 release, unless otherwise noted.
-
---
-exec >/var/tmp/1
-O=v1.6.5-rc3-4-gbf8fc21
-echo O=$(git describe master)
-git shortlog --no-merges $O..master --not maint