From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 05:51:32 +0000 (-0700)
Subject: Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
X-Git-Tag: v1.8.3.4~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279;p=thirdparty%2Fgit.git

Merge branch 'mm/merge-in-dirty-worktree-doc' into maint

* mm/merge-in-dirty-worktree-doc:
  Documentation/git-merge.txt: weaken warning about uncommited changes
---

4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279