I got a conflict on a file and I tried to resolve it using one of my favorit editor (vim or sublime text) but when I opened the file I can't see the diff marks in the file anymore (<<<<<<< HEAD, =======, >>>>>>>).
I'm still able to use vim as git merge-tool and get the editor splitted in 4 windows MERGED / BASE / LOCAL / REMOTE , but I'd rather prefer to come back to the one file editing solution.
Thanks in advance.