Not logged inOpenClonk Forum
Up Topic Merging norefs

This board is threaded (i.e. has a tree structure). Please use the Reply button of the specific post you are referring to, not just any random button. If you want to reply to the topic in general, use the Post button near the top and bottom of the page.

Post Reply
In Response to Günther
I used Mercurial, hgtk and kdiff3. I prefer gitk, though, and kdiff3 might be to blame for that mismerge, so another merge tool (like meld) might have been better.

Powered by mwForum 2.29.7 © 1999-2015 Markus Wichitill