Mercurial > hg
diff tests/test-conflict.t @ 44725:16c361152133
graft: exit 1 on conflicts, like merge
It's more consistent, and makes it nicer to script around hg if you
don't have to ignore exit code 255, which is the error code for
basically everything in hg.
Differential Revision: https://phab.mercurial-scm.org/D8423
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Tue, 14 Apr 2020 19:09:56 -0400 |
| parents | aac921f54554 |
| children | 40411ad2f5d2 |