Add autoload/mergeutil.vim to help perform 3-way merges