On Thu, Aug 30, 2012 at 11:28 AM, Baruch Burstein <[email protected]> wrote: > So, basically it is 3 questions: > 1) Does TortoiseMerge not work with fossil (maybe it sends the command line > parameters wrong?)
You probably need the correct settings for TortoiseMerge, which I don't know. These examples from other merge tools might get you going: fossil settings gmerge-command 'eskil -fine -a "%baseline" "%merge" "%original" -o "%output"' -global fossil settings gmerge-command 'kdiff3 "%baseline" "%original" "%merge" -o "%output"' -global fossil settings gmerge-command 'xxdiff "%original" "%baseline" "%merge" -M "%output"' -global fossil settings gmerge-command 'meld "%baseline" "%original" "%merge" "%output"' -global /Peter _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
