From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 Apr 2013 19:40:58 +0000 (-0700)
Subject: Merge branch 'jk/diff-algo-finishing-touches'
X-Git-Tag: v1.8.3-rc0~69
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/825ccfc23c7834152323586d8470666315dd4347?hp=--cc

Merge branch 'jk/diff-algo-finishing-touches'

"git diff --diff-algorithm algo" is also understood as "git diff
--diff-algorithm=algo".

* jk/diff-algo-finishing-touches:
diff: allow unstuck arguments with --diff-algorithm
git-merge(1): document diff-algorithm option to merge-recursive
---

825ccfc23c7834152323586d8470666315dd4347