summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorLibravatar Felipe Contreras <felipe.contreras@gmail.com>2012-11-04 03:13:29 +0100
committerLibravatar Jeff King <peff@peff.net>2012-11-04 08:35:20 -0500
commit422ab5beb23d461634d202d2446d943513cf329b (patch)
tree7538ef4105b93bf48ff383401e0dba6211a9770f /builtin/merge-tree.c
parentremote-hg: match hg merge behavior (diff)
downloadtgif-422ab5beb23d461634d202d2446d943513cf329b.tar.xz
remote-hg: add support for hg-git compat mode
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions