Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1429:45bd7925dceb
Add control-w key binding to quit hgk.
author | Eric Bloodworth <ergosys@gmail.com> |
---|---|
date | Mon, 24 Oct 2005 14:54:48 -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