Mercurial > hg
diff tests/test-strip.t @ 27040:1bde66b89bb2
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 | cf9ed6d32ccb |
children | e76b27a642ca |