# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1198706612 -3600
# Node ID 1ce185f3c640a0b7210004e3d2145ef64e853a9c
# Parent  e9f1a1ccd51b42f3756fda476968e80e7cd1fe75# Parent  840e2b315c1fcd92ff4e2770fb822bf8a9127083
merge with crew-stable

diff -r e9f1a1ccd51b -r 1ce185f3c640 mercurial/merge.py
--- a/mercurial/merge.py	Tue Dec 25 21:14:11 2007 -0800
+++ b/mercurial/merge.py	Wed Dec 26 23:03:32 2007 +0100
@@ -70,8 +70,9 @@
     for f in wctx.unknown():
         if f in man:
             if mctx.filectx(f).cmp(wctx.filectx(f).data()):
-                raise util.Abort(_("untracked local file '%s' differs"
-                                   " from remote version") % f)
+                raise util.Abort(_("untracked file in working directory differs"
+                                   " from file in requested revision: '%s'")
+                                 % f)
 
 def checkcollision(mctx):
     "check for case folding collisions in the destination context"
@@ -422,8 +423,9 @@
         elif f in ma:
             if n != ma[f] and not overwrite:
                 if repo.ui.prompt(
-                    (_(" local changed %s which remote deleted\n") % f) +
-                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
+                    _(" local changed %s which remote deleted\n"
+                      "use (c)hanged version or (d)elete?") % f,
+                    _("[cd]"), _("c")) == _("d"):
                     act("prompt delete", "r", f)
             else:
                 act("other deleted", "r", f)
@@ -455,8 +457,9 @@
                 act("recreating", "g", f, m2.flags(f))
             elif n != ma[f]:
                 if repo.ui.prompt(
-                    (_("remote changed %s which local deleted\n") % f) +
-                    _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
+                    _("remote changed %s which local deleted\n"
+                      "use (c)hanged version or leave (d)eleted?") % f,
+                    _("[cd]"), _("c")) == _("c"):
                     act("prompt recreating", "g", f, m2.flags(f))
         else:
             act("remote created", "g", f, m2.flags(f))
diff -r e9f1a1ccd51b -r 1ce185f3c640 tests/test-merge1.out
--- a/tests/test-merge1.out	Tue Dec 25 21:14:11 2007 -0800
+++ b/tests/test-merge1.out	Wed Dec 26 23:03:32 2007 +0100
@@ -10,7 +10,7 @@
 M b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% merge should fail
-abort: untracked local file 'b' differs from remote version
+abort: untracked file in working directory differs from file in requested revision: 'b'
 %% merge of b expected
 merging for b
 merging b