@ -322,7 +322,8 @@ public class RebaseCommandTest extends RepositoryTestCase {
checkFile ( theFile ,
checkFile ( theFile ,
"<<<<<<< OURS\n1master\n=======\n1topic\n>>>>>>> THEIRS\n2\n3\ntopic4\n" ) ;
"<<<<<<< OURS\n1master\n=======\n1topic\n>>>>>>> THEIRS\n2\n3\ntopic4\n" ) ;
assertEquals ( RepositoryState . REBASING_MERGE , db . getRepositoryState ( ) ) ;
assertEquals ( RepositoryState . REBASING_INTERACTIVE , db
. getRepositoryState ( ) ) ;
assertTrue ( new File ( db . getDirectory ( ) , "rebase-merge" ) . exists ( ) ) ;
assertTrue ( new File ( db . getDirectory ( ) , "rebase-merge" ) . exists ( ) ) ;
// the first one should be included, so we should have left two picks in
// the first one should be included, so we should have left two picks in
// the file
// the file
@ -410,7 +411,8 @@ public class RebaseCommandTest extends RepositoryTestCase {
assertEquals ( Status . STOPPED , res . getStatus ( ) ) ;
assertEquals ( Status . STOPPED , res . getStatus ( ) ) ;
assertEquals ( conflicting , res . getCurrentCommit ( ) ) ;
assertEquals ( conflicting , res . getCurrentCommit ( ) ) ;
assertEquals ( RepositoryState . REBASING_MERGE , db . getRepositoryState ( ) ) ;
assertEquals ( RepositoryState . REBASING_INTERACTIVE , db
. getRepositoryState ( ) ) ;
assertTrue ( new File ( db . getDirectory ( ) , "rebase-merge" ) . exists ( ) ) ;
assertTrue ( new File ( db . getDirectory ( ) , "rebase-merge" ) . exists ( ) ) ;
// the first one should be included, so we should have left two picks in
// the first one should be included, so we should have left two picks in
// the file
// the file