Update notes for submitted changes

* ResolveMerger: do not content-merge gitlinks on del/mod conflicts
* ResolveMerger: Adding test cases for GITLINK deletion
* ResolveMerger: choose OURS on gitlink when ignoreConflicts
* ResolveMerger: improving content merge readability
* ResolveMerger: extracting createGitLinksMergeResult method
* ResolveMerger: Adding test cases for GITLINK merge

21/4c4afc2c9a7306ac989df218b7cab30ee5e026

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Terry Parker <tparker@google.com>
+Submitted-by: Terry Parker <tparker@google.com>
+Submitted-at: Thu, 03 Sep 2020 18:35:24 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/164491
+Project: jgit/jgit
+Branch: refs/heads/master

29/e998a0e6415fe2f1439be5fe28537c6d3d3dea

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Terry Parker <tparker@google.com>
+Submitted-by: Terry Parker <tparker@google.com>
+Submitted-at: Thu, 03 Sep 2020 18:35:24 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/167565
+Project: jgit/jgit
+Branch: refs/heads/master

2a/e84c320a34ce3e29eaae72292ff7f1b5d723ba

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Terry Parker <tparker@google.com>
+Submitted-by: Terry Parker <tparker@google.com>
+Submitted-at: Thu, 03 Sep 2020 18:35:24 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/168291
+Project: jgit/jgit
+Branch: refs/heads/master

3d/a7ea50a996efccee198ece79c90c2513b482a7

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Terry Parker <tparker@google.com>
+Submitted-by: Terry Parker <tparker@google.com>
+Submitted-at: Thu, 03 Sep 2020 18:35:24 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/167564
+Project: jgit/jgit
+Branch: refs/heads/master

c0/84729f79c840e74557a5df38b5259247c4ddbd

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Terry Parker <tparker@google.com>
+Submitted-by: Terry Parker <tparker@google.com>
+Submitted-at: Thu, 03 Sep 2020 18:35:24 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/162920
+Project: jgit/jgit
+Branch: refs/heads/master

e6/0ea7324f37bd0a1086e27fad52ecc5232e9c06

@@ -0,0 +1,7 @@
+Verified+1: JGit Bot <jgit-bot@eclipse.org>
+Code-Review+2: Terry Parker <tparker@google.com>
+Submitted-by: Terry Parker <tparker@google.com>
+Submitted-at: Thu, 03 Sep 2020 18:35:24 -0400
+Reviewed-on: https://git.eclipse.org/r/c/jgit/jgit/+/167563
+Project: jgit/jgit
+Branch: refs/heads/master