Mercurial > hg
view mercurial/__init__.py @ 27041:0e330f59ef68
filemerge: don't attempt to premerge change/delete conflicts
This is mostly for completeness' sake -- at the moment we don't support any
tools for change/delete conflicts that would do a premerge.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Fri, 13 Nov 2015 23:56:00 -0800 |
parents | 9117c6561b0b |
children | 4374d819ccd5 |