summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-04-18 11:17:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-04-18 11:17:40 -0700
commit8f87d548b6c1fad5f13886f2b1a5acba2764f3b3 (patch)
tree68e62ba17b8520bb1c1c03270ec80f148f74e250 /mergetools/tortoisemerge
parentMerge branch 'fc/complete-aliased-push' (diff)
parentremote-bzr: trivial test fix (diff)
downloadtgif-8f87d548b6c1fad5f13886f2b1a5acba2764f3b3.tar.xz
Merge branch 'fc/remote-helper-fixes'
* fc/remote-helper-fixes: remote-bzr: trivial test fix remote-bzr: include authors field in pushed commits remote-bzr: add support for older versions remote-hg: always normalize paths remote-helpers: allow all tests running from any dir
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions