mergetools / gvimdiff3on commit mergetool: honor -O<orderfile> (654311b)
   1. "$MERGE_TOOLS_DIR/vimdiff"