Mercurial > hg

comparison tests/killdaemons.py @ 27040:1bde66b89bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge._mergecheck: add check for change/delete conflicts Merge tools that perform an actual 3-way merge can't handle change/delete conflicts. This adds a check for that.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 13 Nov 2015 23:58:05 -0800
parents 123c99034cb6
children 05cb9c6f310e
comparison
equal deleted inserted replaced
27039:d7517deedf86 27040:1bde66b89bb2