linux@horizon.com writes: >> +-0 -1 -2:: >> + When an unmerged entry is seen, diff against the base version, >> + the "first branch" or the "second branch" respectively. >> + >> + The default is to diff against the first branch. >> + > > Er... why are these flags zero-based? Because -1 means "first branch" (usually "ours", aka HEAD), and -2 means "second branch" ("theirs", aka MERGE_HEAD), and -0 is for the base (aka merge base)? But I think you are right. The numeric parameters should match stage number for consistency. How about if I redo the patch to make diff-files accept -1/-2/-3 instead, and in addition accept "--base", "--ours", and "--theirs" as synonyms? Side note. diff3 says MINE OLDER YOURS and the way to remember the order is they are alphabetical. We can say the same for base, ours and theirs. - 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 Wed Nov 30 17:43:28 2005
This archive was generated by hypermail 2.1.8 : 2005-11-30 17:43:35 EST