Elijah Newren <newren@xxxxxxxxx> wrote: >> Does the file have conflicts? Try >> git ls-files -s src/c/sock.c Yes, it did have conflicts. I resolved the conflicts via editing, but want to look at the other versions before finalizing the edits. quadra% git ls-files -s src/c/sock.c 100644 ef6c9b94c678dc79760edfd15a0796b3726b76f6 0 src/c/sock.c quadra% Elijah, thanks for replying. -- 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