Mercurial > hg > pyhgsh
view tests/test-conflict.out @ 1286:4f08da74cae8
Make incoming/outgoing show oldest first
author | mpm@selenic.com |
---|---|
date | Thu, 22 Sep 2005 09:22:25 -0700 |
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