comparison mercurial/match.py @ 27652:cc91f3bc5461

_checkunknownfiles: rename 'aborts' to 'conflicts' In upcoming patches we'll be able to do more useful things than aborting.
author Siddharth Agarwal <sid0@fb.com>
date Sat, 02 Jan 2016 03:02:57 -0800
parents 9e2d01707e71
children d3f1b7ee5e70
comparison
equal deleted inserted replaced
27651:07fc2f2134ba 27652:cc91f3bc5461