t / t4100 / t-apply-6.expecton commit Add new test to ensure git-merge handles pull.twohead and pull.octopus (b2eabcc)
   1 Makefile         |    2 +-
   2 git-fetch-script |   41 +++++++++++++++++++++++++++++++++++++++++
   3 git-pull-script  |   34 +---------------------------------
   4 3 files changed, 43 insertions(+), 34 deletions(-)
   5 create git-fetch-script