diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-05-11 11:09:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-11 11:09:00 -0700 |
| commit | 9249175291a00f4984f87107119a3e11e0a092a6 (patch) | |
| tree | 74ea57fa7958a807f43922c34273ef110dccaa2b /t/t9161-git-svn-mergeinfo-push.sh | |
| parent | b387c77b12953d543bf5efc3825b5be26d753f9c (diff) | |
| parent | a7b102302ad9495fb4eb5088ffcb09c44a406c06 (diff) | |
| download | git-9249175291a00f4984f87107119a3e11e0a092a6.tar.gz git-9249175291a00f4984f87107119a3e11e0a092a6.tar.xz | |
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn:
git-svn: added an --include-path flag
Git::SVN::*: add missing "NAME" section to perldoc
git-svn: avoid self-referencing mergeinfo
Diffstat (limited to 't/t9161-git-svn-mergeinfo-push.sh')
| -rwxr-xr-x | t/t9161-git-svn-mergeinfo-push.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t9161-git-svn-mergeinfo-push.sh b/t/t9161-git-svn-mergeinfo-push.sh index 6ef0c0bde..1eab7015c 100755 --- a/t/t9161-git-svn-mergeinfo-push.sh +++ b/t/t9161-git-svn-mergeinfo-push.sh @@ -88,7 +88,6 @@ test_expect_success 'check reintegration mergeinfo' ' test "$mergeinfo" = "/branches/svnb1:2-4,7-9,13-18 /branches/svnb2:3,8,16-17 /branches/svnb3:4,9 -/branches/svnb4:5-6,10-12 /branches/svnb5:6,11" ' |