dolfin team mailing list archive

[pcorreia@xxxxxxxxx]

When running 'hg update' after 'hg pull' in dolfin dir I get

\> hg update
merging doc/manual/dolfin-user-manual.pdf
diff3: subsidiary program `diff' failed
automatic merge failed! Exiting.
merge failed
merging doc/manual/dolfin-user-manual.pdf failed!
34 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges with locally modified files.

How to solve merge problem?

/Paulo