Merge branch 'gv/portable'

[git.git] / builtin / branch.c

diff --git a/builtin/branch.c b/builtin/branch.c
index 6cf7e721e6b59f50c7a8018296aa49848deecda3..f594af0b3b88e5c44545022fb8ed66cb8e302fe0 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -43,13 +43,13 @@ enum color_branch {
        BRANCH_COLOR_PLAIN = 1,
        BRANCH_COLOR_REMOTE = 2,
        BRANCH_COLOR_LOCAL = 3,
-       BRANCH_COLOR_CURRENT = 4,
+       BRANCH_COLOR_CURRENT = 4
 };
 
 static enum merge_filter {
        NO_FILTER = 0,
        SHOW_NOT_MERGED,
-       SHOW_MERGED,
+       SHOW_MERGED
 } merge_filter;
 static unsigned char merge_filter_ref[20];