From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Apr 2013 23:17:13 +0000 (-0700)
Subject: Merge branch 'jk/diff-algo-finishing-touches' into maint
X-Git-Tag: v1.8.2.2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e4d15959d45468bfb13c80195e3a6b40f5b0a489

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

"git diff --diff-algorithm=algo" was understood by the command line
parser, but "git diff --diff-algorithm algo" was not.

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

e4d15959d45468bfb13c80195e3a6b40f5b0a489