diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:24:27 -0700 |
| commit | 9d59e6607a597a0a934566bfa547b45c7b57822c (patch) | |
| tree | c3ff191357256ec88cfb7f770e5b10554c16e34d /rerere.c | |
| parent | Merge branch 'jn/status-translatable' (diff) | |
| parent | mergetool--lib: Add Beyond Compare 3 as a tool (diff) | |
| download | tgif-9d59e6607a597a0a934566bfa547b45c7b57822c.tar.xz | |
Merge branch 'ss/mergetool--lib'
* ss/mergetool--lib:
mergetool--lib: Add Beyond Compare 3 as a tool
mergetool--lib: Sort tools alphabetically for easier lookup
Diffstat (limited to 'rerere.c')
0 files changed, 0 insertions, 0 deletions