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
This commit is contained in:
Junio C Hamano
2014-07-02 12:51:50 -07:00
3 changed files with 4 additions and 4 deletions

View File

@ -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