mergetools / vimdiff2on commit checkout: improve die_if_checked_out() robustness (aaad2c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"