{"thread":{"id":"19350","subject":"mergetool for Solaris","startedAt":"2009-05-14T16:00:09Z","lastAt":"2009-05-14T16:00:09Z","messageCount":1,"participants":["Alan M. Feldstein"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113941","messageId":"4A0C4009.60406@alanfeldstein.com","threadId":"19350","inReplyTo":null,"subject":"mergetool for Solaris","fromName":"Alan M. Feldstein","fromEmail":"alan@alanfeldstein.com","sentAt":"2009-05-14T16:00:09Z","receivedAt":"2009-05-14T16:00:09Z","isPatch":false,"sender":{"key":"alan@alanfeldstein.com","avatar":null},"body":"    jesus% git mergetool\n    merge tool candidates: kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge\n    vimdiff\n    No known merge resolution program available.\n    jesus%\n\n\nI tried building kdiff3-0.9.95. That wasn't much fun. (If any member of the Git \ncommunity wants to explore that with me, I'll provide details.)\n\nSearching for a path of least resistance, I used the above merge tool candidates \nlist in comparison with the list of tool packages available from sunfreeware.com \nand selected tkdiff. Standalone, tkdiff launches successfully. But git mergetool \nfails to launch it:\n\n    jesus% git mergetool\n    merge tool candidates: kdiff3 tkdiff xxdiff meld gvimdiff opendiff emerge\n    vimdiff\n    Merging the files: about.html\n\n    Normal merge conflict for 'about.html':\n      {local}: modified\n      {remote}: modified\n    Hit return to start merge resolution tool (tkdiff):\n    Neither ~/.dt/sessions/current/dt.resources nor\n            ~/.dt/sessions/home/dt.resources was readable\n       Falling back to plain X\n    Error in startup script: expected integer but got \"bold\"\n        (processing \"-font\" option)\n        invoked from within\n    \".client.left.text tag configure inlinetag -background DodgerBlue -font\n    {TkFixedFont bold}\"\n        (\"eval\" body line 1)\n        invoked from within\n    \"eval \"$widget tag configure $tag $opts($tag)\"\"\n        (procedure \"build-client\" line 106)\n        invoked from within\n    \"build-client\"\n        (procedure \"create-display\" line 40)\n        invoked from within\n    \"create-display\"\n        (procedure \"main\" line 57)\n        invoked from within\n    \"main\"\n        (file \"/usr/local/bin/tkdiff\" line 9515)\n    merge of about.html failed\n    jesus%\n\nIt seems to me inappropriate for Git to be looking for ~/.dt/ (which doesn't \nexist), because I'm running the Java Desktop System, not CDE.\n\nHas anyone had success with mergetool on Solaris? Or can anyone help with \nmergetool/tkdiff (that looks solvable)?\n\n-- \n*Alan Feldstein*\nArchitectural Verification Engineer, Cosmic Horizon \n<http://www.alanfeldstein.com/>\nalan@alanfeldstein.com <mailto:alan@alanfeldstein.com>\n*http://www.linkedin.com/in/feldstein*\n\t\nwork: +1 585 415 6682\nSee who we know in common <http://www.linkedin.com/e/wwk/1301367/> \tWant \na signature like this? <http://www.linkedin.com/e/sig/1301367/>\n"}]}