summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-02 12:52:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-02 12:52:46 -0700
commit64d845477b555a06ce469860861691d003335e9c (patch)
tree5b11e3b1e24ec047311d18abf2c4d31d7e01f7f7 /builtin
parentMerge git://ozlabs.org/~paulus/gitk (diff)
parentMerge branch 'maint-1.8.5' into maint (diff)
downloadtgif-64d845477b555a06ce469860861691d003335e9c.tar.xz
Merge branch 'maint'
* maint: t7300: repair filesystem permissions with test_when_finished enums: remove trailing ',' after last item in enum
Diffstat (limited to 'builtin')
-rw-r--r--builtin/clean.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/clean.c b/builtin/clean.c
index 9a9151575d..27701d222c 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -48,7 +48,7 @@ enum color_clean {
CLEAN_COLOR_PROMPT = 2,
CLEAN_COLOR_HEADER = 3,
CLEAN_COLOR_HELP = 4,
- CLEAN_COLOR_ERROR = 5,
+ CLEAN_COLOR_ERROR = 5
};
#define MENU_OPTS_SINGLETON 01