On Mon, Feb 21, 2011 at 08:23:42AM -0500, Richard Hipp wrote: > Just to clearify, by "3-way merge", you mean a graphical merging tool? I > ask because Fossil always has done a 3-way merge behind the scenes - it just > doesn't show you what it is doing or give you the opportunity to intervene.
I think he means what I asked for about a year ago. Simply an option to skip the fossil's internal merge and write out the files to merge using external tools (common ancestor, my revision, remote revision, target file). -- My GnuPG key is at http://petr.madnetwork.org/home/contact/pubkey.asc Key fingerprint = 0F04 503F EF79 2B8D B63C 00B4 AD2F 0594 FAA5 0053
pgpkrK5xkHupH.pgp
Description: PGP signature
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
