summaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-01-15 21:12:12 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-01-15 21:12:12 -0800
commit7cb038a692ec0bdc0f442380678e8e87e26d4e68 (patch)
treebb1b80cca9e3d46d87dec7f150d4b9cf11b1ead7 /git-merge-stupid.sh
parentdescribe: do not silently ignore indescribable commits (diff)
parentdiffcore-break/diffcore-rename: integer overflow. (diff)
downloadtgif-7cb038a692ec0bdc0f442380678e8e87e26d4e68.tar.xz
Merge branch 'fixo/1.0'
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions