Mercurial > hg
diff tests/test-subrepo-paths.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 | ee07f9d142c9 |
children | 4441705b7111 |