diff tests/test-excessive-merge.t @ 26988:7e38d49bc713

strip: switch to mergestate.clean() See the previous patches for why we're doing this.
author Siddharth Agarwal <sid0@fb.com>
date Tue, 17 Nov 2015 17:02:35 -0800
parents b87acfda5268
children b7a966ce89ed
line wrap: on
line diff