[PATCH 1 of 4] [merge-tools] tool.marker=True will leave premerge markers in $local

[David Champion]

# HG changeset patch
# User David Champion <dgc at uchicago.edu>
# Date 1271869065 18000
# Node ID 307cbb6e9ff1c12781b5641fcb870dc1e8dd1569
# Parent  479f15f3faa918ab54546fe1644a9cdf76314b23
[merge-tools] tool.marker=True will leave premerge markers in $local

diff -r 479f15f3faa9 -r 307cbb6e9ff1 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sat Apr 17 13:38:42 2010 -0500
+++ b/mercurial/filemerge.py	Wed Apr 21 11:57:45 2010 -0500
@@ -184,7 +184,8 @@
             os.unlink(b)
             os.unlink(c)
             return 0
-        util.copyfile(back, a) # restore from backup and try again
+        if not _toolbool(ui, tool, "markers"):
+            util.copyfile(back, a) # restore from backup and try again
 
     env = dict(HG_FILE=fd,
                HG_MY_NODE=short(mynode),