Translations:Dispatch-conf/41/en

vimdiff (for gvimdiff use -f option moreover) can also be used to merge changes. To use Neovim, replace %s %s at the end with -d %s %s.