Excerpts from William Morgan's message of Mon Mar 23 15:49:13 +0100 2009: > Reformatted excerpts from nicolas.pouillard's message of 2009-03-23: > > I've applied the resolution in a local branch, a attach to patches. > > The first is done with 'git diff' before commit the conflict resolution. > > The second is done with 'git diff HEAD^' just after. > > Only the second patch was really necessary. But thanks, it worked! > > I've applied this patch on a branch called multi-remove-labels and it's > been merged into next.
Great -- Nicolas Pouillard _______________________________________________ sup-talk mailing list [email protected] http://rubyforge.org/mailman/listinfo/sup-talk
