diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-14 12:57:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-14 12:57:17 -0800 |
| commit | 746b6fb96852accae8a4163f6edda23a4c6de0c7 (patch) | |
| tree | adf9a485ba9e9c2a8c6378edba0b7bf652ca5b0b /xdiff/xprepare.h | |
| parent | Merge branch 'jk/userdiff-config-simplify' (diff) | |
| parent | mergetools/meld: Use --help output to detect --output support (diff) | |
| download | tgif-746b6fb96852accae8a4163f6edda23a4c6de0c7.tar.xz | |
Merge branch 'jn/ancient-meld-support'
* jn/ancient-meld-support:
mergetools/meld: Use --help output to detect --output support
Diffstat (limited to 'xdiff/xprepare.h')
0 files changed, 0 insertions, 0 deletions