Mercurial > hg

comparison tests/test-merge5.out @ 2019:ced2d3620f95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add merge command. means same thing as "update -m". repo.addchangegroup method now returns number of heads modified and added, so command line can tell whether update or merge needed. this makes tiny change to ssh wire protocol, but change is backwards compatible. pull command now returns 0 if no changes to pull.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 29 Mar 2006 10:27:16 -0800
parents 5a034646e472
children 5c4496ed152d
comparison
equal deleted inserted replaced
2015:1a09814a5b1f 2019:ced2d3620f95
1 removing b 1 removing b
2 this update spans a branch affecting the following files: 2 this update spans a branch affecting the following files:
3 b 3 b
4 aborting update spanning branches! 4 aborting update spanning branches!
5 (use update -m to merge across branches or -C to lose changes) 5 (use 'hg merge' to merge across branches or '-C' to lose changes)