Merging changes from two users throws an error when using Mercurial

What steps will reproduce the problem?

1. Setup gitit for using Mercurial for it's version control.

2. Setup two users.

3. Open the same page for editing with both users.

4. Make a change to the page and save as one user.

5. Make a change to the page and save as the other user.


The following message appears:

Server error: UnknownError: mergeContents requires 'git' or 'merge', and neither was found in the path.

What is the expected output? What do you see instead?

Either the second user should be stopped from saving with a warning message, or the user should be provided an interface to merge his/her changes with the other user's changes.

What version of the product are you using? On what operating system?

Ubuntu 10.10 server amd64

pandoc_1.5.1.1-5+b1_amd64.deb from:

http://ftp.de.debian.org/debian/pool/main/p/pandoc/pandoc_1.5.1.1-5+b1_amd64.deb

libghc6-filestore-data_0.3.4.2-1_all.deb from:

http://ftp.us.debian.org/debian/pool/main/h/haskell-filestore/libghc6-filestore-data_0.3.4.2-1_all.deb

gitit_0.7.3.6-1+b1_amd64.deb from:

http://ftp.uk.debian.org/debian/pool/main/g/gitit/gitit_0.7.3.6-1+b1_amd64.deb

Google Code Info:

Issue #: 111

Author: mr.werew...@gmail.com

Created On: 2011-01-20T14:57:37.000Z

Closed On: