[Yanel-dev] Creating a patch [WAS: Re: First steps with Mercurial

[Cedric Staub]

> Any idea how I can see these conflicts?

They should shown if you open the file.

Cheers
Cedric
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.wyona.org/pipermail/yanel-development/attachments/20110314/dafcc857/attachment.pgp>