Mercurial Mercurial > hg-stable / 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>
Tue, 25 Jul 2006 17:54:58 +0200
changeset 2669 b013c9daae69
parent 2175 b2ae81a7df29
child 4365 46280c004f22
permissions -rw-r--r--
Include all tests/*.py files in the MANIFEST so tests won't fail on tarballs. This fixes failing test-http-proxy and test-webraw.

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
hg-stable