apply: remove directory that becomes empty by renaming the last file away

diff --git a/git-merge.sh b/git-merge.sh
index bf1fd4f06b42ca7c07d7a64fba7921c48d6fd72f..b2f8a2acd398b7c61b68a59c6d3631ca84be0727 100755 (executable)
--- 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