summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-19 07:46:05 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-19 07:46:05 -0800
commitecd3e2f42504f035620376343db1a4cbafe5db92 (patch)
tree56300b28fee3529647bd0dc4abcfdd5e9ac86da6 /xdiff-interface.c
parentMerge branch 'maint' (diff)
parentt4014: fix arguments to grep (diff)
downloadtgif-ecd3e2f42504f035620376343db1a4cbafe5db92.tar.xz
Merge branch 'jc/maint-test-portability' into 'jc/test-portability'
* jc/maint-test-portability: t4014: fix arguments to grep t9502: do not assume GNU tar t0200: "locale" may not exist
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions