From mboxrd@z Thu Jan 1 00:00:00 1970 From: wmorgan-sup@masanjin.net (William Morgan) Date: Sun, 22 Mar 2009 14:21:46 -0700 Subject: [sup-talk] [PATCH] Allow multi_edit_labels to remove labels using -lab (the "; l" key binding) In-Reply-To: <1237390328-sup-1506@ausone.local> References: <1237228536-sup-7811@ausone.local> <1237390328-sup-1506@ausone.local> Message-ID: <1237756617-sup-7606@entry> Reformatted excerpts from nicolas.pouillard's message of 2009-03-18: > This patch conflict with the undo feature, I've locally resolved the > merge. However I don't really know what the best way to share the > conflict resolution. That's a good question. For some reason git format-patch doesn't produce anything for merge commits, even if they contain conflict resolution changes. Maybe it's for a good reason; I don't know. But you can use git diff. After merging and resolving the conflict, if you do "git diff HEAD^", that should output the conflict-resolution changes. You can send that to me and I can use it to replicate the commit. -- William