* Shawn O. Pearce: >> I've memorized it long long ago. But my coworkers haven't and always >> get it wrong, and look at me funny when I tell them "trust me, your >> data is in stage 2 and theirs is in stage 3... because that's the >> convention all of the tools you are using follows". > > Actually, what's wrong with the following: > > git show HEAD:foo.c > git show MERGE_HEAD:foo.c > > ? I think that in the staged versions, the non-conflicting parts of the merge are in fact merged. For the HEAD/MERGE_HEAD versions, this isn't the case, obviously. -- Florian Weimer <fweimer@xxxxxx> BFK edv-consulting GmbH http://www.bfk.de/ Kriegsstraße 100 tel: +49-721-96201-1 D-76133 Karlsruhe fax: +49-721-96201-99 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
