mergetools / gvimdiff2on commit parse-options: avoid magic return codes (f41179f)
   1. "$MERGE_TOOLS_DIR/vimdiff"