git p4: move conflict prompt into run, add [q]uit input