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 Eric Hopper <hopper@omnifarious.org>
Fri, 30 Jun 2006 08:45:52 -0700
changeset 2536 8106e477f584
parent 2175 b2ae81a7df29
child 4361 46280c004f22
permissions -rw-r--r--
Fix new tests to be better. In particular, fix webraw test to specify a date on commit to be less brittle, and fix test-oldcgi to test fetching a subdirectory of a webdir instance.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merge: warning: conflicts during merge
merging a
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
  hg update -C 2
  hg merge 1
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a
mercurial-crew-with-dirclash