summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-18 16:45:55 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-18 16:45:55 -0700
commit6625864c8ce9868ba4ab41165d97084f3f04bbed (patch)
treef2b24821f9cc75fc8f2c04016f1461b8f218b29e /merge-tree.c
parentMerge branch 'sh/daemon' into next (diff)
parentTentative built-in format-patch. (diff)
downloadtgif-6625864c8ce9868ba4ab41165d97084f3f04bbed.tar.xz
Merge branch 'jc/fmt-patch' into next
* jc/fmt-patch: Tentative built-in format-patch.
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions