summaryrefslogtreecommitdiff
path: root/t/t4116-apply-reverse.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-07 02:17:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-07 02:17:28 -0700
commit86d72443215612f66f77dfc57ec9613c8153617c (patch)
tree82923deca0de6a8ae263ba84e7f239e881db8388 /t/t4116-apply-reverse.sh
parentMerge branch 'dr/ceiling' (diff)
parentrerere.autoupdate (diff)
downloadtgif-86d72443215612f66f77dfc57ec9613c8153617c.tar.xz
Merge branch 'jc/rerere'
* jc/rerere: rerere.autoupdate t4200: fix rerere test rerere: remove dubious "tail_optimization" git-rerere: detect unparsable conflicts rerere: rerere_created_at() and has_resolution() abstraction
Diffstat (limited to 't/t4116-apply-reverse.sh')
0 files changed, 0 insertions, 0 deletions