Update notes for submitted changes

* Add git config for conflict style merge/diff3

e5/8bf0870e069fc758d1d9c83b83b8ab80929f34

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Matthias Sohn <matthias.sohn@sap.com>
+Submitted-by: Matthias Sohn <matthias.sohn@sap.com>
+Submitted-at: Wed, 26 May 2021 08:30:41 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/180118
+Project: jgit/jgit
+Branch: refs/heads/master