[gnufx]

And so you should be. Smerge is a useful addition, including as a find-file hook for resolving conflicts.