GitConflictResolver.sublime-settings

{
	// The git path
	// by default the plugin assumes that git is in your path
	"git_path": "git",

	// Enable or disable the live matching of conflict areas
	// By default the plugin matches live
	"live_matching": true,

	// The color of the highlighting is called "scope" in Sublime Text,
	// to change this color you can choose a different scope.
	// This customization isn't easy, since you have to define your own
	// scope in your theme file.
	"matching_scope": "invalid",

	// This option enables the filling the conflict area with a color
	// By default the area will just be outlined
	"fill_conflict_area": false,

	// This option enables the outline of the conflict area
	// By default the area will just be outlined
	// In Sublime Text 2 the area will only be outlined if "fill_conflict_area" is false
	"outline_conflict_area": true,

    // This options enable the gutter marks for the different conflict groups
    "ours_gutter": true,
    "theirs_gutter": true,
    "ancestor_gutter": true,

    // This option changes the display of the "Show Conflict Files" functionality"
    // true: Show only the filesnames ("src/main.js" becomes "main.js")
    // false: Show relative path (from the root of the repository)
    // By default Git Conflict Resolver only shows the filename
    "show_only_filename": true
}