Code

Merge branch 'kb/diff-C-M-synonym'
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:58:59 +0000 (12:58 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Dec 2010 20:58:59 +0000 (12:58 -0800)
commitcf7a64b54afe28ff61b362abc04399de383977e0
tree66ef37300dfa1b75c13f43e15df15ac8392afebb
parent914584266c7675d3d0fa18e0eed05742327b22e5
parentf611ddc774b58864b1f0b02962c524683a2f6c59
Merge branch 'kb/diff-C-M-synonym'

* kb/diff-C-M-synonym:
  diff: use "find" instead of "detect" as prefix for long forms of -M and -C
  diff: add --detect-copies-harder as a synonym for --find-copies-harder
diff.c