Chris Packham schrieb: > $ git checkout --merge -- cpu/mpc83xx/start.S > $ git show :1:$(git rev-parse --show-prefix)cpu/mpc83xx/start.S > fatal: Path 'cpu/mpc83xx/start.S' is in the index, but not at stage 1. > Did you mean ':0:cpu/mpc83xx/start.S'? Both of these work only as long as the index still records the conflicted state. If you (or one of your tools) has git-added the file, or you have git-checked-out some version of the file, the conflict stages are lost, and you must reset --hard and redo the entire merge. -- Hannes -- 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