Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 1405:6fd6527f95eb
log: speedup keyword search when used with --branch
By avoiding unnecessary branch lookup.
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Tue, 18 Oct 2005 20:06:13 -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