diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-04 15:02:27 -0800 |
| commit | 24161eb036e140c964d278e24190ef2ad558caf0 (patch) | |
| tree | 3e20ac3b018645953437dc896f382cf94545cc63 /git-mergetool--lib.sh | |
| parent | Merge branch 'jn/test-terminal-punt-on-osx-breakage' (diff) | |
| parent | diffcore-rename: improve estimate_similarity() heuristics (diff) | |
| download | tgif-24161eb036e140c964d278e24190ef2ad558caf0.tar.xz | |
Merge branch 'lt/rename-no-extra-copy-detection'
* lt/rename-no-extra-copy-detection:
diffcore-rename: improve estimate_similarity() heuristics
diffcore-rename: properly honor the difference between -M and -C
for_each_hash: allow passing a 'void *data' pointer to callback
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions