diff options
| author |  Sam Vilain <sam.vilain@catalyst.net.nz> | 2009-10-20 15:42:02 +1300 |
|---|---|---|
| committer |  Eric Wong <normalperson@yhbt.net> | 2009-10-26 23:51:55 -0700 |
| commit | ce62683096d144749c77e557ecd21c91b840b0f1 (patch) | |
| tree | b0367af91492041041cd0ed429786885e548ed05 /merge-recursive.h | |
| parent | git-svn: convert SVK merge tickets to extra parents (diff) | |
| download | tgif-ce62683096d144749c77e557ecd21c91b840b0f1.tar.xz | |
git-svn: add test data for SVN 1.5+ merge, with script.
Dump generated with SVN 1.5.1 (on lenny amd64). This test
should hopefully cover all but a few intermediate versions of
the svnmerge.py script.
Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz>
Acked-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions