Add tests as suggested by Eric Sunshine. Also fixes an inconsitency in the last
part.
Since there were no tests for the --rename-threshold option, I added them in a
separate commit, which is useful in itself.
The other two commits contain the previous patches plus the relevant tests.
For the last part, I made --find-renames (without =<n>) reset the similarity
index to the default, just as in git-diff.
Felipe Gonçalves Assis (3):
merge-recursive: test rename threshold option
merge-recursive: option to disable renames
merge-recursive: more consistent interface
Documentation/merge-strategies.txt | 12 +-
merge-recursive.c | 14 +-
merge-recursive.h | 1 +
...s.sh => t3032-merge-recursive-space-options.sh} | 2 +-
t/t3034-merge-recursive-rename-options.sh | 200 +++++++++++++++++++++
5 files changed, 225 insertions(+), 4 deletions(-)
rename t/{t3032-merge-recursive-options.sh =>
t3032-merge-recursive-space-options.sh} (99%)
create mode 100755 t/t3034-merge-recursive-rename-options.sh
--
2.7.1.342.gf5bb636
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
