cmdutils: remove #if 0-ed conflict marger trash that i forgot
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>