On 8/4/06, Martin Langhoff <martin@catalyst.net.nz> wrote: > This is a bit of a crude but really useful shortcut for conflict resolution. > The name is bad, but git-merge-* is a different 'namespace', and git-resolve is > also taken. git-xxmerge? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Fri Aug 04 18:10:20 2006
This archive was generated by hypermail 2.1.8 : 2006-08-04 18:10:51 EST