Mercurial > hg
diff tests/get-with-headers.py @ 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 | 5a6820f8da4d |
children | 8e86679d8acd |