mergetools / gvimdiff2on commit Merge branch 'nd/checkout-m' (4a3ed2b)
   1. "$MERGE_TOOLS_DIR/vimdiff"