mergetools / vimdiff3on commit restore: replace --force with --ignore-unmerged (a5e5f39)
   1. "$MERGE_TOOLS_DIR/vimdiff"