Mercurial > hg
view tests/test-conflict.out @ 1351:0e2be889ccd7
Repair ancestor logic, fix up test cases
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 26 Sep 2005 16:52:47 -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