summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Adrian Weimann <adrian.weimann@googlemail.com>2012-01-30 20:29:33 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-01-30 12:19:06 -0800
commitaad070922157d3249af7095ecff6ebc074c13bb9 (patch)
treec86e944e318d3a16b182d54f62dd6c58931cbd7c /builtin/merge-base.c
parentKick off the post 1.7.9 cycle (diff)
downloadtgif-aad070922157d3249af7095ecff6ebc074c13bb9.tar.xz
completion: --edit and --no-edit for git-merge
Signed-off-by: Adrian Weimann <adrian.weimann@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions