mergetools / gvimdiff2on commit diff-parseopt: convert --patience (31fd640)
   1. "$MERGE_TOOLS_DIR/vimdiff"