diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:51:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:51:50 -0700 |
| commit | c2f7b1026e33e308782fcb1b60e3d7af107fdc18 (patch) | |
| tree | 8768ef958c9dea375afcada68df1d0f1ae6d59c3 /builtin | |
| parent | 341e7e8eda3dbeb6867f4f8f45b671201b807de5 (diff) | |
| parent | 45067fc973c31953ab283f77f0f91eba9a272624 (diff) | |
| download | git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.gz git-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.xz | |
Merge branch 'maint-1.8.5' into maint
* maint-1.8.5:
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 9a9151575..27701d222 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 |