summaryrefslogtreecommitdiff
path: root/t/t4121-apply-diffs.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-23 21:51:38 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-23 21:51:38 -0800
commit5dc1308562ab5991ecada68b06707709bea408c9 (patch)
tree321b8d7310c01d8b01584377d9aba448952a7384 /t/t4121-apply-diffs.sh
parentMerge branch 'maint' (diff)
parentbash completions: Add the --patience option (diff)
downloadtgif-5dc1308562ab5991ecada68b06707709bea408c9.tar.xz
Merge branch 'js/patience-diff'
* js/patience-diff: bash completions: Add the --patience option Introduce the diff option '--patience' Implement the patience diff algorithm Conflicts: contrib/completion/git-completion.bash
Diffstat (limited to 't/t4121-apply-diffs.sh')
0 files changed, 0 insertions, 0 deletions