config: enable merge.printcandidatecommmits

Summary:
The feature was completed by Phil in D9816270. It's handy and can probably
reduce user support burden like: https://fb.intern.facebook.com/groups/scm/permalink/2039619916087618/

Therefore let's enable it.

Reviewed By: DurhamG

Differential Revision: D14293405

fbshipit-source-id: 54e934e0bf495c090109462e4f743d427df39380

edenscm/mercurial/configitems.py

@@ -330,6 +330,7 @@ coreconfigitem("experimental", "merge.checkpathconflicts", default=False)
 coreconfigitem("merge", "followcopies", default=True)
 coreconfigitem("merge", "on-failure", default="continue")
 coreconfigitem("merge", "preferancestor", default=lambda: ["*"])
+coreconfigitem("merge", "printcandidatecommmits", default=False)
 coreconfigitem("merge-tools", ".*", default=None, generic=True)
 coreconfigitem(
     "merge-tools",

edenscm/mercurial/filemerge.py

@@ -438,8 +438,7 @@ def _describefailure(r, repo, mynode, orig, fcd, fco, fca):
         "warning: %d conflicts while merging %s! (edit, then use 'hg resolve --mark')\n"
     ) % (r, relpath)
 
-    # internal config: merge.printcandidatecommmits
-    if repo.ui.configbool("merge", "printcandidatecommmits", False):
+    if repo.ui.configbool("merge", "printcandidatecommmits"):
         candidates, hit_max = _findconflictingcommits(repo, fcd, fca)
     else:
         candidates, hit_max = [], False

edenscm/mercurial/help/config.txt

@@ -1350,6 +1350,10 @@ This section specifies behavior during merges and updates.
    halted, the repository is left in a normal ``unresolved`` merge state.
    (default: ``continue``)
 
+``printcandidatecommmits``
+   If set to ``true``, calculate and print potentially conflicted commits
+   when there are merge conflicts. (default: ``false``)
+
 ``merge-patterns``
 ------------------