diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -421,7 +421,9 @@ class ui(object):
 
         If not interactive -- the default is returned
         """
-        if not self.interactive: return default
+        if not self.interactive:
+            self.note(msg, ' ', default, "\n")
+            return default
         while True:
             try:
                 r = self._readline(msg + ' ')
diff --git a/tests/test-merge-types.out b/tests/test-merge-types.out
--- a/tests/test-merge-types.out
+++ b/tests/test-merge-types.out
@@ -5,6 +5,8 @@ resolving manifests
  overwrite None partial False
  ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
   searching for copies back to rev 1
+ conflicting flags for a
+(n)one, e(x)ec or sym(l)ink? n
  a: update permissions -> e
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
@@ -15,6 +17,8 @@ resolving manifests
  overwrite None partial False
  ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
   searching for copies back to rev 1
+ conflicting flags for a
+(n)one, e(x)ec or sym(l)ink? n
  a: remote is newer -> g
 getting a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff --git a/tests/test-rename-merge2.out b/tests/test-rename-merge2.out
--- a/tests/test-rename-merge2.out
+++ b/tests/test-rename-merge2.out
@@ -455,6 +455,8 @@ resolving manifests
   searching for copies back to rev 1
  b: versions differ -> m
  rev: versions differ -> m
+remote changed a which local deleted
+use (c)hanged version or leave (d)eleted? c
  a: prompt recreating -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
@@ -480,6 +482,8 @@ resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
   searching for copies back to rev 1
+ local changed a which remote deleted
+use (c)hanged version or (d)elete? c
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b