mergetools / gvimdiff2on commit Merge branch 'jc/update-instead-into-void' (fa9aaa8)
   1. "$MERGE_TOOLS_DIR/vimdiff"