# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1462697021 -7200
# Node ID bdc86e178255892a62c2c8736e9f516056d2d700
# Parent  2822e9a5263b94afc8dcfc1e51ebfebe1e1f9956
devel: use the new 'config' argument for the update develwarn

diff -r 2822e9a5263b -r bdc86e178255 mercurial/merge.py
--- a/mercurial/merge.py	Sun May 08 10:43:41 2016 +0200
+++ b/mercurial/merge.py	Sun May 08 10:43:41 2016 +0200
@@ -1442,9 +1442,7 @@
             pas = [repo[ancestor]]
 
         if node is None:
-            if (repo.ui.configbool('devel', 'all-warnings')
-                    or repo.ui.configbool('devel', 'oldapi')):
-                repo.ui.develwarn('update with no target')
+            repo.ui.develwarn('update with no target', 'oldapi')
             rev, _mark, _act = destutil.destupdate(repo)
             node = repo[rev].node()