summaryrefslogtreecommitdiff
path: root/wt-status.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-05 07:04:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-07 04:16:01 (GMT)
commit4d4d5726aee31522e90df21ef62ee3377c5d8f8d (patch)
treecc1a50ed2de0a96f98415017b824ab8865a5ec0c /wt-status.h
parent50b7e70f338e54f3534ee1b14c3bdb4c80d0dcf7 (diff)
downloadgit-4d4d5726aee31522e90df21ef62ee3377c5d8f8d.zip
git-4d4d5726aee31522e90df21ef62ee3377c5d8f8d.tar.gz
git-4d4d5726aee31522e90df21ef62ee3377c5d8f8d.tar.bz2
status: show worktree status of conflicted paths separately
When a path is unmerged in the index, we used to always say "unmerged" in the "Changed but not updated" section, even when the path was deleted in the work tree. Remove unmerged entries from the "Updated" section, and create a new section "Unmerged paths". Describe how the different stages conflict in more detail in this new section. Note that with the current 3-way merge policy (with or without recursive), certain combinations of index stages should never happen. For example, having only stage #2 means that a path that did not exist in the common ancestor was added by us while the other branch did not do anything to it, which would have autoresolved to take our addition. The code nevertheless prepares for the possibility that future merge policies may leave a path in such a state. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.h')
-rw-r--r--wt-status.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h
index 82a602b..f80142f 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -10,6 +10,7 @@ enum color_wt_status {
WT_STATUS_CHANGED,
WT_STATUS_UNTRACKED,
WT_STATUS_NOBRANCH,
+ WT_STATUS_UNMERGED,
};
enum untracked_status_type {