diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:33:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-27 15:33:07 -0800 |
| commit | bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea (patch) | |
| tree | 9074c7aa81b7dbd3908132246d6392ef569933d8 /trace.c | |
| parent | Merge branch 'tr/merge-edit-guidance' into maint (diff) | |
| parent | mergetools/meld: Use --help output to detect --output support (diff) | |
| download | tgif-bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea.tar.xz | |
Merge branch 'jn/ancient-meld-support' into maint
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support
Diffstat (limited to 'trace.c')
0 files changed, 0 insertions, 0 deletions