Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-conflict.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 13 Mar 2006 13:19:23 +0100
changeset 1936 8393baa0858c
parent 1933 7544700fd931
child 2175 b2ae81a7df29
permissions -rw-r--r--
Make test-remove portable for strange strftime implementations (second try). I forgot to replace the date output for 'hg log -p', too.

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a
mercurial-crew-with-dirclash