tests/test-rename-merge2.out

--- a/tests/test-rename-merge2.out	Mon Feb 09 07:55:42 2009 -0600
+++ b/tests/test-rename-merge2.out	Sun Feb 15 10:50:48 2009 -0600
@@ -484,6 +484,7 @@
   searching for copies back to rev 1
  local changed a which remote deleted
 use (c)hanged version or (d)elete? c
+ a: prompt keep -> a
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b