# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-11-18 23:40:28
# Node ID 63d6bc874dea3d98ebbd4835654b3cb72119caef
# Parent  de7bf242644ec6fa407b6d4dac99c5982edea1bb

filemerge: add support for change/delete conflicts to the ':local' merge tool

This covers two of the four cases of change/delete conflicts -- in an upcoming
patch we'll make :other cover the other two.

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -237,7 +237,7 @@ def _iprompt(repo, mynode, orig, fcd, fc
 @internaltool('local', nomerge)
 def _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf):
     """Uses the local version of files as the merged version."""
-    return 0, False
+    return 0, fcd.isabsent()
 
 @internaltool('other', nomerge)
 def _iother(repo, mynode, orig, fcd, fco, fca, toolconf):