summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-09-03 09:43:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-09-03 09:43:08 -0700
commit79b4fde573eb5e86a8109d100ad182be1eb5fc54 (patch)
treec680b4aa0bafc8424889789b494bfecf1f2c74b7 /xdiff/xmerge.c
parentMerge branch 'maint' (diff)
parentMerge branch 'maint-1.6.3' into maint (diff)
downloadtgif-79b4fde573eb5e86a8109d100ad182be1eb5fc54.tar.xz
Merge branch 'maint'
* maint: git-clone: add missing comma in --reference documentation
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions