Mercurial

To update the local repository when there are conflicting merge with basic updating, launch hg update -C ( local changes will be discarded !).