summaryrefslogtreecommitdiff
path: root/builtin-merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-04-12 21:04:09 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-12 21:04:09 -0700
commitcd8d918601e28d3aa86b63eeea223b86d71ce1b6 (patch)
treef73e863ab694f1c9aaab91525fd187afcc9f98d1 /builtin-merge-file.c
parentFix git {log,show,...} --pretty=email (diff)
parenthandle_options in git wrapper miscounts the options it handled. (diff)
downloadtgif-cd8d918601e28d3aa86b63eeea223b86d71ce1b6.tar.xz
Merge branch 'maint'
* maint: handle_options in git wrapper miscounts the options it handled.
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions