Hmm, having trouble with cat-file syntax On Thu, Mar 11, 2010 at 12:29 PM, Markus Heidelberg <markus.heidelberg@xxxxxx> wrote: > Not mergetool, but checkout: > git checkout --merge -- file Ok. $ git checkout --merge -- cpu/mpc83xx/start.S > git cat-file blob :1:file > file.base > $ git cat-file blob :1:cpu/mpc83xx/start.S > cpu/mpc83xx/start.S.base fatal: Not a valid object name :1:cpu/mpc83xx/start.S So I think I have figured out that I'm trying to get at stage 1, 2 and 3 of the file that git checkout --merge has just setup but I'm tripping over the syntax. Also if it helps $ git --version git version 1.7.0.1 -- 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