diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:45:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:45:49 -0700 |
| commit | 751e2b371892d34a4619b69a50426e368d053c41 (patch) | |
| tree | 6350019f71648a8656e795e9e9880ac5a4856983 /git-mergetool.sh | |
| parent | ac4d29550f94ff793630deb82488c0b717dea859 (diff) | |
| parent | 5d21adcbfe5540b89831fef2a2581d54dee4d478 (diff) | |
| download | git-751e2b371892d34a4619b69a50426e368d053c41.tar.gz | |
Merge branch 'fc/contrib-bzr-hg-fixes'
* fc/contrib-bzr-hg-fixes:
contrib/remote-helpers: quote variable references in redirection targets
contrib/remote-helpers: style updates for test scripts
remote-hg: use notes to keep track of Hg revisions
remote-helpers: cleanup more global variables
remote-helpers: trivial style fixes
remote-hg: improve basic test
remote-hg: add missing &&s in the test
remote-hg: fix test
remote-bzr: make bzr branches configurable per-repo
remote-bzr: fix export of utf-8 authors
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions