Mercurial > hg
diff tests/test-merge6.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 | f2719b387380 |
children | 2428e8ec0793 |