Revision 0c44c94309693d0582e91a6744edc2e8eba46ef8 authored by Junio C Hamano on 29 April 2009, 18:08:18 UTC, committed by Junio C Hamano on 29 April 2009, 23:50:21 UTC
We cannot represent the 3-way conflicted state in the work tree for these entries, but it is normal not to have commit objects for them in our repository. Just update the index and the life will be good. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent d212ca1
| File | Mode | Size |
|---|---|---|
| sha1.c | -rw-r--r-- | 1.8 KB |
| sha1.h | -rw-r--r-- | 565 bytes |
| sha1_arm.S | -rw-r--r-- | 3.5 KB |
Computing file changes ...
