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. -- William <[email protected]> _______________________________________________ sup-talk mailing list [email protected] http://rubyforge.org/mailman/listinfo/sup-talk
