mergetools / vimdiff3on commit Merge branch 'jl/status-added-submodule-is-never-ignored' (6d681f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"