Mercurial > hg
view tests/test-conflict.out @ 1736:50de0887bbcd
add preoutgoing and outgoing hooks.
preoutgoing lets prevent pull over http or ssh.
outgoing lets notify after pull.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 17 Feb 2006 08:26:21 -0800 |
parents | 5a034646e472 |
children | 7544700fd931 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! 32e80765d7fe+75234512624c+ tip something else ======= something M a