diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:40:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:40:35 -0800 |
| commit | b371922aa5b972557cd143461250a9d360882285 (patch) | |
| tree | 8cd7e433ae0bf16e890cc909988ab16bb2b0a554 /server-info.c | |
| parent | 84b96278cc164b748b2c9dbe489f8d7b30bbbc4e (diff) | |
| parent | ff4a18552aa48f3227e2465072951dacc34aee9b (diff) | |
| download | git-b371922aa5b972557cd143461250a9d360882285.tar.gz git-b371922aa5b972557cd143461250a9d360882285.tar.xz | |
Merge branch 'cb/mergetool'
* cb/mergetool:
mergetool: fix running mergetool in sub-directories
mergetool: Add a test for running mergetool in a sub-directory
mergetool: respect autocrlf by using checkout-index
Diffstat (limited to 'server-info.c')
0 files changed, 0 insertions, 0 deletions