diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-01 09:53:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-01 09:53:55 +0300 |
| commit | 6959893b0b65ebc68ce2fb524a8ec15a26ca4972 (patch) | |
| tree | a499f6b0a7309306f667b3cbded1a1bcf1ff35de /diff.c | |
| parent | 452b80058235040461dae01933270c6668741b64 (diff) | |
| parent | d279fc1a76bf9bfeedded1a1c8ebcfc8779f5b10 (diff) | |
Merge branch 'sp/mergetool'
* sp/mergetool:
mergetool: avoid misleading message "Resetting to default..."
mergetool: add support for ECMerge
mergetool: use path to mergetool in config var mergetool.<tool>.path
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions