# # # patch "cmd_conflicts.cc" # from [029018d86c11de95ce81fd36258a1480784a0121] # to [e540342132b143ca5e03d9fdafaa4bcd5da270d9] # ============================================================ --- cmd_conflicts.cc 029018d86c11de95ce81fd36258a1480784a0121 +++ cmd_conflicts.cc e540342132b143ca5e03d9fdafaa4bcd5da270d9 @@ -411,7 +411,7 @@ CMD(clean, "clean", "", CMD_REF(conflict } CMD(clean, "clean", "", CMD_REF(conflicts), - N_(""), + "", N_("Delete any bookkeeping files related to conflict resolution"), "", options::opts::none)