mergetools / vimdiff3on commit t: use nongit() function where applicable (a3c45d1)
   1. "$MERGE_TOOLS_DIR/vimdiff"