{"thread":{"id":"55157","subject":"Bug? I can't manually merge changes with difftool","startedAt":"2021-02-16T18:39:16Z","lastAt":"2021-02-16T18:55:45Z","messageCount":2,"participants":["Victor Porton","Jeff Hostetler"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"417087","messageId":"b46fd946-42ad-2c33-0294-415949b9085e@narod.ru","threadId":"55157","inReplyTo":null,"subject":"Bug? I can't manually merge changes with difftool","fromName":"Victor Porton","fromEmail":"porton@narod.ru","sentAt":"2021-02-16T18:30:20Z","receivedAt":"2021-02-16T18:39:16Z","isPatch":false,"sender":{"key":"porton@narod.ru","avatar":"https://gravatar.com/avatar/26fbbd66c3da4108798dc4fccb153ea484585216cc8f62e678c07a05e8dcd165?d=mp&s=160"},"body":"When I run\n\ngit difftool main HEAD\n\nand manually merge changes in started meld or kdiff3 and then save the\nresulting file, it is saved somewhere in /tmp not in the workdir.\nWorkdir is not modified after I close meld or kdiff3.\n\nI need to store changes in workdir.\n\nIs it a bug of Git 2.27.0.\n\n"},{"id":"417091","messageId":"fd7ced2a-3b07-eb07-cb48-0a57dac9a5e0@jeffhostetler.com","threadId":"55157","inReplyTo":"b46fd946-42ad-2c33-0294-415949b9085e@narod.ru","subject":"Re: Bug? I can't manually merge changes with difftool","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2021-02-16T18:54:28Z","receivedAt":"2021-02-16T18:55:45Z","isPatch":false,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 2/16/21 1:30 PM, Victor Porton wrote:\n> When I run\n> \n> git difftool main HEAD\n> \n> and manually merge changes in started meld or kdiff3 and then save the\n> resulting file, it is saved somewhere in /tmp not in the workdir.\n> Workdir is not modified after I close meld or kdiff3.\n> \n> I need to store changes in workdir.\n> \n> Is it a bug of Git 2.27.0.\n> \n\nWhen you give it two branches or refs, it does a \"historical\" diff\nbetween those two versions.  If you omit \"HEAD\" from the command line,\nit will diff your \"main\" branch against the live version in your\nworktree.\n\nJeff\n\n\n"}]}