You mean conflict markers such as <<<<<<<
, =======
, and >>>>>>>
on merges to indicate that the automatic resolution failed?!
You can use my ConflictMotions plugin for that; it provides ]x
and [x
mappings, ]=
for navigation within a conflict, and even corresponding text objects ax
and a=
.