Junio C Hamano e4d15959d4 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

2013-04-24 16:19:42 -07:00

132 KiB

Raw Permalink Blame History

View Raw