Mercurial > hg-stable

view tests/test-conflict.out @ 1530:abfab59fce79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add a releasefn keyword to lock.lock releasefn is a function that will be executed when the lock is released
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 11 Nov 2005 15:34:09 -0800
parents 5a034646e472
children 7544700fd931
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
32e80765d7fe+75234512624c+ tip
something else
=======
something
M a