Mercurial > hg > pyhgsh
view tests/test-merge5.out @ 1758:47f4fbee32c5
add options to log man page.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Mon, 20 Feb 2006 11:09:25 -0800 |
parents | 5a034646e472 |
children | ced2d3620f95 |
line wrap: on
line source
removing b this update spans a branch affecting the following files: b aborting update spanning branches! (use update -m to merge across branches or -C to lose changes)