From 647579e3af5a078855cc8c963aea6bea12c9c613 Mon Sep 17 00:00:00 2001
From: Matt Mackall <mpm@selenic.com>
Date: Thu, 25 Jun 2015 17:46:55 -0500
Subject: [PATCH] filemerge: mark internal-only config option

---
 mercurial/filemerge.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
index 5388a96f95..bdd9a3ec3d 100644
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -75,6 +75,7 @@ def _picktool(repo, ui, path, binary, symlink):
             return True
         return False
 
+    # internal config: ui.forcemerge
     # forcemerge comes from command line arguments, highest priority
     force = ui.config('ui', 'forcemerge')
     if force: