X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge.sh;h=7ebbce4bdbaf243a7a5612c024216b8ccf8eae44;hb=baf5597ae43398e485f63f8e9216d34b5cd0a0d6;hp=fa4589173f426d6172883c47479c52b8700cafa8;hpb=e94b4d2f2a3a9b2aaaac15c33d5d31f76531ecbf;p=git.git

diff --git a/git-merge.sh b/git-merge.sh
index fa4589173..7ebbce4bd 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -16,10 +16,10 @@ test -z "$(git ls-files -u)" ||
 LF='
 '
 
-all_strategies='recur recursive octopus resolve stupid ours'
+all_strategies='recur recursive octopus resolve stupid ours subtree'
 default_twohead_strategies='recursive'
 default_octopus_strategies='octopus'
-no_trivial_merge_strategies='ours'
+no_trivial_merge_strategies='ours subtree'
 use_strategies=
 
 index_merge=t