Mercurial > hg-stable
diff tests/test-parents.out @ 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 | 4b0c9c674707 |
| children | 0289f384e1e5 |