{"thread":{"id":"19226","subject":"gitk: showing onging merge as such ?","startedAt":"2009-05-07T11:46:52Z","lastAt":"2009-05-07T11:46:52Z","messageCount":1,"participants":["Yann Dirson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"113205","messageId":"53018.10.0.0.1.1241696812.squirrel@intranet.linagora.com","threadId":"19226","inReplyTo":null,"subject":"gitk: showing onging merge as such ?","fromName":"Yann Dirson","fromEmail":"ydirson@altern.org","sentAt":"2009-05-07T11:46:52Z","receivedAt":"2009-05-07T11:46:52Z","isPatch":false,"sender":{"key":"ydirson@altern.org","avatar":"https://avatars.githubusercontent.com/u/1190950?v=4"},"body":"While resolving a conflicted merge, I wondered if there was any reason why\ngitk does not show that we are indeed doing a merge, by showing the staged\ncontents as a merge commit if MERGE_HEAD is found.\n\nIs there any reason why we would not do this ?\n\nI had a quick try at how this could be done, here it is.  The diff is not\nyet displayed as combined.\n"}]}