mergetools / gvimdiff3on commit builtin-am: implement --3way (84f3de2)
   1. "$MERGE_TOOLS_DIR/vimdiff"