When merging branches under source control there is often the issue of a merge conflict with other developers.I know that we can use vimdiff to diff code changes against source control, but is there also a way we can use vimdiff to help resolve merge conflicts conflicts.Personally I am interested more in git but it would be useful to understand if there are plugins/techniques for other source control tools/systems.
vimdiff and merge conflicts
vimdiff;version control systems;merge