Update notes for submitted changes

* Allow dir/file conflicts in virtual base commit on recursive merge.

1b/9911d9ae23f14a7e7a5330c47e63a99fe1469d

@@ -0,0 +1,8 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Han-Wen NIenhuys <hanwen@google.com>
+Code-Review+1: Christian Halstrick <christian.halstrick@sap.com>
+Submitted-by: Han-Wen NIenhuys <hanwen@google.com>
+Submitted-at: Thu, 11 Feb 2021 04:35:01 -0500
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/175166
+Project: jgit/jgit
+Branch: refs/heads/master