Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 2795:135823f37304
new extension: fetch -> combine pull and merge/update
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 07 Aug 2006 17:27:38 -0700 |
parents | b2ae81a7df29 |
children | 49988d9f0758 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)