Mercurial > hg
view tests/test-merge-revert.out @ 2019:ced2d3620f95
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 | 7544700fd931 |
children | d436b21b20dc |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip eb43f19ff115 eb43f19ff115+ eb43f19ff115 016807e6fdaf tip merging file1 016807e6fdaf tip 016807e6fdaf tip 016807e6fdaf tip 016807e6fdaf tip