summaryrefslogtreecommitdiff
path: root/diffcore-order.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-27 15:33:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-27 15:33:07 -0800
commitbdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea (patch)
tree9074c7aa81b7dbd3908132246d6392ef569933d8 /diffcore-order.c
parentMerge branch 'tr/merge-edit-guidance' into maint (diff)
parentmergetools/meld: Use --help output to detect --output support (diff)
downloadtgif-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 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions