Optionally use JGit's new recursive merger
This only affects content merges, and is off by default as the
upstream implementation is experimental and may still be buggy.
Change-Id: I113ed457bc0caec53cba8d2142a743938a4a1883
diff --git a/ReleaseNotes/ReleaseNotes-2.6.txt b/ReleaseNotes/ReleaseNotes-2.6.txt
index a2e67d67..d1d32c5 100644
--- a/ReleaseNotes/ReleaseNotes-2.6.txt
+++ b/ReleaseNotes/ReleaseNotes-2.6.txt
@@ -131,7 +131,7 @@
Embedded Jetty is now 8.1.7.v20120910.
* ASM bytecode library is now 4.0.
-* JGit is now 2.2.0.201212191850-r.
+* JGit is now 2.3.1.201302201838-r.55-ge175daf.
* asciidoc 8.6.3 is now required to build the documentation.
* link:https://code.google.com/p/gerrit/issues/detail?id=1155[Issue 1155]:
prettify is now r225
@@ -160,6 +160,9 @@
may need to retry a change not yet merged by the first. Please note
we still do not believe this is sufficient to enable multi-master.
+* Added a server-level option to use JGit's new, experimental recursive
+ merger.
+
SSH
~~~
* `plugin ls` shows status of enabled plugins as "ENABLED".
