summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-30 22:16:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-30 22:16:18 -0700
commitd2bbb7c2bcf6e77ebfcabf4e12110fe6d5c91de6 (patch)
tree09c755c9fadf7ea2b34c7a65fb743a39d26ec103 /merge.c
parentMerge branch 'sh/rebase-i-reread-todo-after-exec' (diff)
downloadtgif-d2bbb7c2bcf6e77ebfcabf4e12110fe6d5c91de6.tar.xz
Merging a handful of topics before -rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions