diff tests/test-resolve.t @ 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 777f668eca70
children 8abd9f785030
line wrap: on
line diff