Mercurial > hg
comparison tests/test-diff-subdir.out @ 11353:f2b25e8ea6c1
merge: when current branch has 1 or > 2 heads, actually abort.
Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.
| author | Greg Ward <greg-hg@gerg.ca> |
|---|---|
| date | Mon, 14 Jun 2010 16:06:52 -0400 |
| parents | 66eff8355168 |
| children |
comparison
equal
deleted
inserted
replaced
| 11352:b19067ee4507 | 11353:f2b25e8ea6c1 |
|---|