status: show worktree status of conflicted paths separately

[git.git] / wt-status.h

diff --git a/wt-status.h b/wt-status.h
index 82a602b3bbd0921d52f5ef528fdd4af146c4b796..f80142ffdecb928d7c9e3f72e0d9f9d27102118c 100644 (file)
--- 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 {