index b1771a13c88fa8ec8d5ca6e04c8d5b73bee3209e..bca4212e565c95f79a76a14cc4444e72e472a22c 100644 (file)
message if conflicts were detected. Level 1 outputs only
conflicts, 2 outputs conflicts and file changes. Level 5 and
above outputs debugging information. The default is level 2.
- Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+ Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
branch.<name>.mergeoptions::
Sets default options for merging into branch <name>. The syntax and