Code

Merge branch 'ap/merge-backend-opts'
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:50 +0000 (20:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 04:28:50 +0000 (20:28 -0800)
commitfcb2a7e4a3c7899a3432f5804889fa3ea5779220
tree0f0785d427c23c7b8dbaae1afcdbd370ea3b639c
parente98f80f50bf9b78aab8cea6184fd708259d0c3b3
parent566c511195adc0ce88559853f2f00933e241d862
Merge branch 'ap/merge-backend-opts'

* ap/merge-backend-opts:
  Document that merge strategies can now take their own options
  Extend merge-subtree tests to test -Xsubtree=dir.
  Make "subtree" part more orthogonal to the rest of merge-recursive.
  pull: Fix parsing of -X<option>
  Teach git-pull to pass -X<option> to git-merge
  git merge -X<option>
  git-merge-file --ours, --theirs

Conflicts:
git-compat-util.h
Documentation/git-merge-file.txt
Documentation/merge-options.txt
builtin-merge.c
cache.h
git-compat-util.h
git-pull.sh
git.c
ll-merge.c
merge-recursive.c
merge-recursive.h
strbuf.c