summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-05 08:16:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-05 08:16:27 (GMT)
commitf8abaebab3fe1a1b873f9636ea410ac4007c8fa8 (patch)
tree0501ad7e7fc1a0641d73dc7f554238b0f73484a9 /builtin/merge-index.c
parent04f2ddda8426d3ae46d52d9dcbfc00bd3c52e645 (diff)
parent531c8dd4fb18e653d6170d367e4b23c3164d5ce0 (diff)
downloadgit-f8abaebab3fe1a1b873f9636ea410ac4007c8fa8.zip
git-f8abaebab3fe1a1b873f9636ea410ac4007c8fa8.tar.gz
git-f8abaebab3fe1a1b873f9636ea410ac4007c8fa8.tar.bz2
Merge branch 'maint'
* maint: fixup-builtins: retire an old transition helper script
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions