Sneaky capslock...
diff3 so that I can see the original version of a merge conflict