summaryrefslogtreecommitdiff
path: root/xdiff/xutils.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-15 12:40:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-15 12:40:58 -0700
commit825ccfc23c7834152323586d8470666315dd4347 (patch)
tree167d5ec8fee33505252fd7dd76fa6bdeadf972ee /xdiff/xutils.h
parentMerge branch 'rt/commentchar-fmt-merge-msg' (diff)
parentdiff: allow unstuck arguments with --diff-algorithm (diff)
downloadtgif-825ccfc23c7834152323586d8470666315dd4347.tar.xz
Merge branch 'jk/diff-algo-finishing-touches'
"git diff --diff-algorithm algo" is also understood as "git diff --diff-algorithm=algo". * jk/diff-algo-finishing-touches: diff: allow unstuck arguments with --diff-algorithm git-merge(1): document diff-algorithm option to merge-recursive
Diffstat (limited to 'xdiff/xutils.h')
0 files changed, 0 insertions, 0 deletions