# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1447487863 28800
# Node ID 30b919bc49bf892fc6c565423f1e5172ad05e21b
# Parent  0e330f59ef68b41a3d09f3f0bf71fa801ecbee10
filemerge: don't try using external tools on change/delete conflicts

This is mostly for completeness' sake -- the current code shouldn't get to this
point.

diff -r 0e330f59ef68 -r 30b919bc49bf mercurial/filemerge.py
--- a/mercurial/filemerge.py	Fri Nov 13 23:56:00 2015 -0800
+++ b/mercurial/filemerge.py	Fri Nov 13 23:57:43 2015 -0800
@@ -447,6 +447,10 @@
 
 def _xmerge(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None):
     tool, toolpath, binary, symlink = toolconf
+    if fcd.isabsent() or fco.isabsent():
+        repo.ui.warn(_('warning: %s cannot merge change/delete conflict '
+                       'for %s\n') % (tool, fcd.path()))
+        return False, 1, None
     a, b, c, back = files
     out = ""
     env = {'HG_FILE': fcd.path(),