mergetools / gvimdiff2on commit checkout: retire --ignore-other-worktrees in favor of --force (0d1a151)
   1. "$MERGE_TOOLS_DIR/vimdiff"