git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3fa3666 6562928)
Merge branch 'jk/diff-algo' into maint
authorJunio C Hamano <redacted>
Mon, 28 Oct 2013 17:16:11 +0000 (10:16 -0700)
committerJunio C Hamano <redacted>
Mon, 28 Oct 2013 17:16:11 +0000 (10:16 -0700)
commitb28325d3ab0172063d1fbe0e735d899ae43c6fee
tree6bdda226074cf9062438565df4f4ffcd96d7d9a5tree | snapshot
parent3fa366668a2cfee9abfa62701b5176acb316f169commit | diff
parent6562928ae9ea46a3f2a7bd5a3dd500a7c149cc64commit | diff
Merge branch 'jk/diff-algo' into maint

"git merge-recursive" did not parse its "--diff-algorithm=" command
line option correctly.

* jk/diff-algo:
  merge-recursive: fix parsing of "diff-algorithm" option
merge-recursive.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT