>That's a painful way to do it. Unless you have conflicts, merging should be >painless. It sounds to me like you are using 'fossil gdiff' to resolve your >merges manually instead of using 'fossil merge'? This was only a work around because I couldn't use meld to resolve my merge.
I do always use fossil gdiff before I commit after a merge to double check the results. If I can't use meld, can anyone suggest a merge tool which shows it's differences like meld/p4merge do, and allow me to edit and works with fossil's gmerge-command as it currently stands? Thanks Kevin _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
