summaryrefslogtreecommitdiff
path: root/mergetools/tortoisemerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 15:37:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-13 15:37:46 -0700
commit6a9aa0c9b224517db0549d9252fdbc5177e6c0e2 (patch)
tree20af572cbb7b794f4b6d317348d78dbf307f1be3 /mergetools/tortoisemerge
parentMerge branch 'jn/vcs-svn' (diff)
parentgit-remote-mediawiki: be more defensive when requests fail (diff)
downloadtgif-6a9aa0c9b224517db0549d9252fdbc5177e6c0e2.tar.xz
Merge branch 'mm/mediawiki-tests'
* mm/mediawiki-tests: git-remote-mediawiki: be more defensive when requests fail git-remote-mediawiki: more efficient 'pull' in the best case git-remote-mediawiki: extract revision-importing loop to a function git-remote-mediawiki: refactor loop over revision ids git-remote-mediawiki: change return type of get_mw_pages git-remote-mediawiki (t9363): test 'File:' import and export git-remote-mediawiki: support for uploading file in test environment git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push git-remote-mediawiki (t9360): test git-remote-mediawiki clone git-remote-mediawiki: test environment of git-remote-mediawiki git-remote-mediawiki: scripts to install, delete and clear a MediaWiki
Diffstat (limited to 'mergetools/tortoisemerge')
0 files changed, 0 insertions, 0 deletions