From: layer <layer@known.net>
Date: Wed, 08 Apr 2009 18:02:42 GMT
Subject: Re: need help with git show :1:...
Message-ID: <7199.1239213762@relay.known.net>
In-Reply-To: <51419b2c0904081058p7d5a56c3j6aa5cebb0188ad43@mail.gmail.com>

Elijah Newren <newren@gmail.com> 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.