diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 14:32:46 -0700 |
| commit | 322c6244651c408d924f71f73effd8ed833916d3 (patch) | |
| tree | 6e8cf8d283e2a923cc330b4b64eeb3c972341edd /git-merge.txt | |
| parent | 0762262193bb8a218def4fd749a68476d5337b5d (diff) | |
| download | git-htmldocs-322c6244651c408d924f71f73effd8ed833916d3.tar.gz | |
Autogenerated HTML docs for v2.3.4-263-gf53fc
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.txt b/git-merge.txt index cf2c374b7..1f94908e3 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -232,7 +232,7 @@ Barbie's remark on your side. The only thing you can tell is that your side wants to say it is hard and you'd prefer to go shopping, while the other side wants to claim it is easy. -An alternative style can be used by setting the "merge.conflictstyle" +An alternative style can be used by setting the "merge.conflictStyle" configuration variable to "diff3". In "diff3" style, the above conflict may look like this: @@ -329,7 +329,7 @@ CONFIGURATION ------------- include::merge-config.txt[] -branch.<name>.mergeoptions:: +branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and supported options are the same as those of 'git merge', but option values containing whitespace characters are currently not supported. |