diff options
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 1fecedbbc..83bf3e783 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -42,8 +42,6 @@ include::merge-options.txt[] You need at least one <commit>. Specifying more than one <commit> obviously means you are trying an Octopus. -include::merge-strategies.txt[] - HOW MERGE WORKS --------------- @@ -240,6 +238,8 @@ changes into a merge commit. Small fixups like bumping release/version name would be acceptable. +include::merge-strategies.txt[] + CONFIGURATION ------------- include::merge-config.txt[] |