- if (diff_unmerged_stage < 0) {
- /* default to "ours" if unmerged index, otherwise 0 */
- for (i = 0; i < entries; i++) {
- struct cache_entry *ce = active_cache[i];
- if (ce_stage(ce)) {
- diff_unmerged_stage = 2;
- break;
- }
- }
- if (diff_unmerged_stage < 0)
- diff_unmerged_stage = 0;
- }
-
-