mergetools / gvimdiff2on commit Merge branch 'hu/cherry-pick-previous-branch' (0809208)
   1. "$MERGE_TOOLS_DIR/vimdiff"