summaryrefslogtreecommitdiff
path: root/mergetools/diffuse
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-01 13:28:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-01 13:28:25 -0700
commit3ba46634202968045e05e4d7f969d97c61efa53d (patch)
tree38e71726997c2161a44016af1407bf182cb625a9 /mergetools/diffuse
parentMerge branch 'nh/empty-rebase' (diff)
parentrebase: report invalid commit correctly (diff)
downloadtgif-3ba46634202968045e05e4d7f969d97c61efa53d.tar.xz
Merge branch 'ef/maint-rebase-error-message'
By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
Diffstat (limited to 'mergetools/diffuse')
0 files changed, 0 insertions, 0 deletions