mergetools / gvimdiff3on commit remote.c: refactor setup of branch->merge list (ee2499f)
   1. "$MERGE_TOOLS_DIR/vimdiff"