Mercurial > hg
diff hgext/factotum.py @ 30859:086c37652735 stable
merge: more safe detection of criss cross merge conflict between dm and r
41f6af50c0d8 introduced handling of a crash in this case. A review comment
suggested that it was not entirely obvious that a 'dm' always would have a 'r'
for the source file.
To mitigate that risk, make the code more conservative and make less
assumptions.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 01 Feb 2017 02:10:30 +0100 |
parents | 2c019aac6b99 |
children | 21b568820a3c |