Add new option vc-git-resolve-conflicts