From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Nov 2009 00:28:06 +0000 (-0800)
Subject: Merge branch 'tr/maint-merge-ours-clarification' (early part)
X-Git-Tag: v1.6.6-rc0~14
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c50230f75109677d7adf0bd94f99d17f35a519a6;p=git.git

Merge branch 'tr/maint-merge-ours-clarification' (early part)

* 'tr/maint-merge-ours-clarification' (early part):
  rebase docs: clarify --merge and --strategy
  Documentation: clarify 'ours' merge strategy
---

c50230f75109677d7adf0bd94f99d17f35a519a6