tests/test-conflict.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 10 Mar 2007 23:01:00 -0300
changeset 4193 9e3121017fb2
parent 2175 b2ae81a7df29
child 4361 46280c004f22
permissions -rw-r--r--
Optimize return value of util._matcher for common command line case This will trigger every time somebody runs something like "hg diff" or "hg status" without any arguments. The important part here is returning util.always as the match function, which is a much simpler (and faster) function than the usual return value, and allows other code to just skip the filtering if it knows all files will match.

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