18 + grep -Ev '>>>|<<<' a
19 something else
20 =======
21 something
22 + hg status
23 C a
23 M a
24 ? .out