Mercurial > hg
view tests/test-mq-qdelete.out @ 6521:a3668330f14a
test that internal merge tools are used when set for a merge-pattern in hgrc
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
author | Dov Feldstern <dfeldstern@fastimap.com> |
---|---|
date | Fri, 04 Apr 2008 02:20:58 +0300 |
parents | 2ececafa5859 |
children | 37eedb1a1848 |
line wrap: on
line source
adding base abort: qdelete requires at least one revision or patch name abort: cannot delete applied patch c Now at: b a b a b series status Now at: a a b series status 1 [mq]: a 0 base abort: cannot delete revision 3 above applied patches f 4 [mq]: f 3 [mq]: e 2 [mq]: d 1 [mq]: a 0 base