{"thread":{"id":"2472","subject":"gitk diff fails on merges","startedAt":"2005-11-12T13:34:29Z","lastAt":"2005-11-12T13:34:29Z","messageCount":1,"participants":["Lorenzo Campedelli"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"11677","messageId":"dl4r17$7vl$1@sea.gmane.org","threadId":"2472","inReplyTo":null,"subject":"gitk diff fails on merges","fromName":"Lorenzo Campedelli","fromEmail":"lorenzo.campedelli@tele2.it","sentAt":"2005-11-12T13:34:29Z","receivedAt":"2005-11-12T13:34:29Z","isPatch":false,"sender":{"key":"lorenzo.campedelli@tele2.it","avatar":null},"body":"Hello,\n\nI'm using the following:\n\n[campedel@betelgeuse ~]$ git --version\ngit version 0.99.9g\n[campedel@betelgeuse ~]$ cg --version\ncogito-0.16rc1\n\nI think there's a bug in gitk diffing, both\n\t'Diff selected -> this'\nand\n\t'Diff this -> selected'\nfail when applied on the result of a merge.\n\nTo replicate the problem you can use the attached script\nand then try diffing against branch_1 head.\n\nThanks for your attention (and for your wonderful work!)\n\nLorenzo\n\n\ncg init\necho abc > a.file\ncg add a.file\ncg commit -m 'added a.file'\ncg tag tag_1\necho def >> a.file\ncg commit -m 'modified a.file'\ngit checkout -b branch_1 tag_1\necho ghi > b.file\ncg add b.file\ncg commit -m 'added b.file'\ncg merge -c master\ncg commit -m 'merged with master'\ngitk --all\n\nexit\n"}]}