Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 1953:379ab45b91b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change default strftime format for better portability On some systems, such as Solaris and HP-UX, "%c" format give output without the leading zero on the single-digit month-day.
author TK Soh <teekaysoh@yahoo.com>
date Tue, 14 Mar 2006 22:01:30 -0800
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