From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 06:48:28 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint-1.6.2
X-Git-Tag: v1.6.3.3~10^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd12f536129357d5347c1953db69bde68b5f46c9?hp=--cc

Merge branch 'maint-1.6.1' into maint-1.6.2

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

cd12f536129357d5347c1953db69bde68b5f46c9