git notes merge: List conflicting notes in notes merge commit message

diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index 0ec315aa9ba2f98fa281104d0d9f214c11aeadab..287fab82d71741d8068ee6f42d6e13e9a4eb52ec 100755 (executable)
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -333,6 +333,12 @@ EOF
        git log -1 --format=%B refs/notes/m > merge_commit_msg &&
        grep -q refs/notes/m merge_commit_msg &&
        grep -q refs/notes/z merge_commit_msg &&
+       # Merge commit mentions conflicting notes
+       grep -q "Conflicts" merge_commit_msg &&
+       ( for sha1 in $(cat expect_conflicts); do
+               grep -q "$sha1" merge_commit_msg ||
+               exit 1
+       done ) &&
        # Verify contents of merge result
        verify_notes m &&
        # Verify that other notes refs has not changed (w, x, y and z)
@@ -456,6 +462,12 @@ EOF
        git log -1 --format=%B refs/notes/m > merge_commit_msg &&
        grep -q refs/notes/m merge_commit_msg &&
        grep -q refs/notes/z merge_commit_msg &&
+       # Merge commit mentions conflicting notes
+       grep -q "Conflicts" merge_commit_msg &&
+       ( for sha1 in $(cat expect_conflicts); do
+               grep -q "$sha1" merge_commit_msg ||
+               exit 1
+       done ) &&
        # Verify contents of merge result
        verify_notes m &&
        # Verify that other notes refs has not changed (w, x, y and z)