summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-01 13:28:25 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-01 13:28:25 -0700
commit3ba46634202968045e05e4d7f969d97c61efa53d (patch)
tree38e71726997c2161a44016af1407bf182cb625a9 /ll-merge.c
parent264d5a717bb450ae06969face25c70b000e1358f (diff)
parent9180feafbc7c637a4fae72d1ca1d3b2245b4302c (diff)
downloadgit-3ba46634202968045e05e4d7f969d97c61efa53d.tar.gz
Merge branch 'ef/maint-rebase-error-message'
By Erik Faye-Lund * ef/maint-rebase-error-message: rebase: report invalid commit correctly
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions