{"thread":{"id":"3417","subject":"gitk: error on find","startedAt":"2006-02-21T13:44:27Z","lastAt":"2006-02-21T13:44:27Z","messageCount":1,"participants":["Michael"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16502","messageId":"200602211444.27162.barra_cuda@katamail.com","threadId":"3417","inReplyTo":null,"subject":"gitk: error on find","fromName":"Michael","fromEmail":"barra_cuda@katamail.com","sentAt":"2006-02-21T13:44:27Z","receivedAt":"2006-02-21T13:44:27Z","isPatch":false,"sender":{"key":"barra_cuda@katamail.com","avatar":"https://avatars.githubusercontent.com/u/16371673?v=4"},"body":"On GIT repository:\n\n~/git$ git --version\ngit version 1.2.0\n~/git$ gitk --all -d\n\nif I search for \"1.0.0\" and hit \"return\", gitk gives:\n\nerror:\n\ninvalid command name \"contmergediff\"\ninvalid command name \"contmergediff\"\n    while executing\n\"contmergediff $ids\"\n    (procedure \"gettreediffline\" line 14)\n    invoked from within\n\"gettreediffline file5 c894168631e4b7da66ed3993a4c92380d38599a8\"\n\n\n...and goes to commit 8d712aafd2df3c1f5147a28947f98cefe667cf76, while the \nfirst commit containing \"1.0.0\" is c894168631e4b7da66ed3993a4c92380d38599a8\n\nIn general, pressing <return> instead of clicking \"find\", causes gitk to skip \na commit (without other errors). This behaviour is present since (at last) \nGIT version 1.0.0.\n\nSearching for \"1.0.0\" but clicking on \"find\" gives no errors.\n\nI think \"contmergediff\" is an old procedure, but I don't know how to fix it \n(nor exactly what was meant to do). The error was first introduced with \ncommit b77b02785d2f589ca336fc449ee1c27837263dac (it was a big change, so the \n\"contmergediff\" line was probably forgotten).\n"}]}