Add the simple scripts I used to do a merge with content conflicts.

[git.git] / checkout-cache.c

diff --git a/checkout-cache.c b/checkout-cache.c
index 1c25766..5cd473c 100644 (file)
--- a/checkout-cache.c
+++ b/checkout-cache.c
@@ -141,6 +141,8 @@ static int checkout_all(void)
 
        for (i = 0; i < active_nr ; i++) {
                struct cache_entry *ce = active_cache[i];
+               if (ce_stage(ce))
+                       continue;
                if (checkout_entry(ce) < 0)
                        return -1;
        }