Mercurial > hg
view tests/test-abort-checkin.out @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Wed, 05 Mar 2008 09:10:45 -0800 |
parents | 5c5d23d93447 |
children |
line wrap: on
line source
error: pretxncommit.nocommits hook failed: no commits allowed transaction abort! rollback completed abort: no commits allowed error: pretxncommit.nocommits hook failed: no commits allowed transaction abort! rollback completed abort: no commits allowed