mergetools / gvimdiff2on commit am: parse options in stuck-long mode (8833662)
   1. "$MERGE_TOOLS_DIR/vimdiff"