aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2005-11-06 10:26:07 -0600
committerJunio C Hamano <junkio@cox.net>2005-11-06 10:31:48 -0800
commitbb73d73c0885fce357e0d70aa51c2215a8e38a4e (patch)
treefef586ef93089ddb1088c003cb84cafa8ba3c81b /Documentation/git-merge.txt
parent3402f1d6a3d8f4205fe59286e3a1223a9d28aea6 (diff)
downloadgit-bb73d73c0885fce357e0d70aa51c2215a8e38a4e.tar.gz
git-bb73d73c0885fce357e0d70aa51c2215a8e38a4e.tar.xz
Refactor merge strategies into separate includable file.
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3e058db99..b3ef19bae 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -34,6 +34,8 @@ include::merge-pull-opts.txt[]
least one <remote>. Specifying more than one <remote>
obviously means you are trying an Octopus.
+include::merge-strategies.txt[]
+
SEE ALSO
--------