Tuomas Suutari 9560808f2e t9151: Add two new svn:mergeinfo test cases ... When svn:mergeinfo contains two new parents in a specific order and one is ancestor of the other, it is possible that git-svn discards the wrong one. The first test case ("commit made to merged branch is reachable from the merge") proves this. The second test case ("merging two branches in one commit is detected correctly") is just for completeness, since there was no test for merging two (feature) branches to trunk in one commit. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net>		2010-02-26 01:30:23 -08:00
..
.gitignore
make-svnmerge-dump
svn-mergeinfo.dump