diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:10:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:10:30 -0700 |
| commit | d22acacf810a92d5634099a7db0367ce5b6fdcef (patch) | |
| tree | 9536fe05bcb4067f19cd8020bc5bc04c468df7b7 /builtin/clean.c | |
| parent | Git 1.9.4 (diff) | |
| parent | annotate: use argv_array (diff) | |
| download | tgif-d22acacf810a92d5634099a7db0367ce5b6fdcef.tar.xz | |
Merge branch 'maint-1.8.5' into maint-1.9
* maint-1.8.5:
annotate: use argv_array
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum
Diffstat (limited to 'builtin/clean.c')
| -rw-r--r-- | builtin/clean.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 977a068f11..8926ca851c 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 |