X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fbranch.c;h=f594af0b3b88e5c44545022fb8ed66cb8e302fe0;hb=8d676d85f772ce3a100b6f0dddd1c34a7e4313cf;hp=6cf7e721e6b59f50c7a8018296aa49848deecda3;hpb=ddd02b70f0d80fc3cac6b2f2c42005560d572413;p=git.git diff --git a/builtin/branch.c b/builtin/branch.c index 6cf7e721e..f594af0b3 100644 --- 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];