[OpenWalnut-Dev] abort: outstanding uncommitted changes

[Alexander Wiebel]

Dear Walnuts,
I just found a nice and most imprtantly _easy_ solution for the above
message when merging. Please follow this link:

http://mercurial.selenic.com/wiki/FAQ#FAQ.2BAC8-CommonProblems.Why_won.27t_Mercurial_let_me_merge_when_I_have_uncommitted_changes.3F

I hope this helps some of you.

Cheers,
Alex

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.informatik.uni-leipzig.de/pipermail/openwalnut-dev/attachments/20120704/4c317b94/attachment.asc>