Mercurial > hg
comparison tests/test-patch @ 6672:6004eedb13f4
keyword: mimic cmdutil.bail_if_changed even more
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Thu, 12 Jun 2008 02:27:06 +0200 |
parents | 0de7e6e27fe4 |
children |
comparison
equal
deleted
inserted
replaced
6671:938eddd76237 | 6672:6004eedb13f4 |
---|