Artifact 37031e7c5daaf74485835b681321b0f8e4b4adf0:

Ticket change [37031e7c5d] - New ticket [427938e2f6] three-way merge. by anonymous 2010-04-12 21:18:17.

---

D 2010-04-12T21:18:17
J comment I\swould\slike\sto\srequest\ssupport\sfor\s3-way\smerge\susing\sexternal\sdiff\stool\sinstead\sof\sthe\sdefault\sauto-merge.\sThe\sfeature\scan\sbe\sseen\sfor\sexample\sin\s[http://doc.bazaar.canonical.com/latest/en/user-guide/resolving_conflicts.html|bazaar\sdocs]\sor\s[http://www.perforce.com/perforce/products/merge.html|perforce\sweb]\sand\swas\sdiscussed\s[http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg01854.html|on\sthe\smailing\slist].\r\n\r\nBazaar\screates\s3\sfiles\sin\saddition\sto\sthe\sauto-merged\sfile,\swhich\scan\sbe\spassed\sto\sthe\sexternal\smerge\stool.\sA\sbzr\sresolve\scommand\sis\sthen\scalled\swhich\schecks\sthe\smerged\sfile\sand\sdeletes\sthe\stemporary\sfiles.\r\nPerforce\suses\sinternal\smerge\stool\swhich\saccesses\sthe\srepository\sdirectly.\r\nSince\sthe\sPerforce-way\swould\srequire\ssupport\sfor\saccessing\sfossil\srepos\sdirectly,\sa\sreasonable\sway\swould\sbe\susing\sthe\stemporary\sfiles\sas\sbazaar\sdoes.\r\n\r\nMany\stools\sare\scapable\sof\sthis\stype\sof\smerge\s(meld,\sdiffuse,\skdiff,\swinmerge,\s...)
J private_contact 58d7f093230d4b46d75dd37c4f48e709a9ed1400
J severity Minor
J status Open
J title three-way\smerge
J type Feature_Request
K 427938e2f69393d22b884be577e2e670ec23bea4
U anonymous
Z 629f97ed3fe00cbbded9302f18c91269