Mercurial > hg
comparison tests/test-simple-update.t @ 26525:abc2327e382a
filemerge: add some merge types
We're going to turn the 'trymerge' boolean into a 'mergetype' enum with these
three possible values.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 07 Oct 2015 15:13:41 -0700 |
parents | f2719b387380 |
children | 92bca12328d1 |
comparison
equal
deleted
inserted
replaced
26524:61c295d9d402 | 26525:abc2327e382a |
---|