tree 93e421911fc6e07f3dd18ea83aab9bd4ce2dd26e
parent dfe50511c7e5ec2bc771c9a5f4c3318332a7744e
parent d4900ee48c70114ea3227f922d383de6b273fcde
author Junio C Hamano <gitster@pobox.com> 1245566901 -0700
committer Junio C Hamano <gitster@pobox.com> 1245566901 -0700

Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  git-show-ref.txt: remove word and make consistent
  git-svn documentation: fix typo in 'rebase vs. pull/merge' section
  use xstrdup, not strdup in ll-merge.c