summaryrefslogtreecommitdiff
path: root/t/t3600-rm.sh
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-12-28 07:35:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-28 09:08:06 (GMT)
commit6b5a795bf586aa019bbb11ffe9f2fc315ba9765e (patch)
tree9a2ce7462d6cbade246358a6695d8e4f116121fd /t/t3600-rm.sh
parentde811948baa689382ad191c1c95e8be51a92c4fe (diff)
downloadgit-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.zip
git-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.tar.gz
git-6b5a795bf586aa019bbb11ffe9f2fc315ba9765e.tar.bz2
Allow git-merge to select the default strategy.
Now that git-merge knows how to use the pull.{twohead,octopus} configuration options to select the default merge strategy there is no reason for git-pull to do the same immediately prior to invoking git-merge. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3600-rm.sh')
0 files changed, 0 insertions, 0 deletions