Update notes for submitted changes

* Implement ours/theirs content conflict resolution

82/10f29fe43ccd35e7d2ed3ed45a84a75b2717c4

@@ -0,0 +1,7 @@
+Code-Review+2: Matthias Sohn <matthias.sohn@sap.com>
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Submitted-by: Matthias Sohn <matthias.sohn@sap.com>
+Submitted-at: Sun, 18 Apr 2021 20:44:25 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/179234
+Project: jgit/jgit
+Branch: refs/heads/master