Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 2109:1b183976e007
Revert push new heads logic
This breaks push -r's new head detection but fixes the common case.
For now we'll assume that someone doing push -r knows what they're doing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 21 Apr 2006 16:30:23 -0500 |
parents | 7544700fd931 |
children | b2ae81a7df29 |
line wrap: on
line source
merge: warning: conflicts during merge merging a merging a failed! e7fe8eb3e180+0d24b7662d3e+ tip something else ======= something M a