From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 06:48:46 +0000 (-0700)
Subject: Merge branch 'maint-1.6.2' into maint
X-Git-Tag: v1.6.3.3~10
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f;p=git.git

Merge branch 'maint-1.6.2' into maint

* maint-1.6.2:
  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
---

3ba4f3a9fc68ba4c5a0064107e8993c5fc5b684f