mergetools / gvimdiff3on commit mv: combine two if(s) (dcadc8b)
   1. "$MERGE_TOOLS_DIR/vimdiff"