in cvs/testSource/com/intellij/cvsSupport2/ProcessMergedWithConflictsFileTest.java [193:274]
public void test3() throws Exception {
doTest(
"<%-- \n" +
"<<<<<<< test2.jsp \n" +
"change 5.5 \n" +
"=======\n" +
"<<<<<<< test2.jsp \n" +
"<<<<<<< test2.jsp \n" +
"change 6 \n" +
"=======\n" +
"change 3 \n" +
">>>>>>> 1.6.6.1 \n" +
"=======\n" +
"change 2 \n" +
">>>>>>> 1.6.4.1 \n" +
">>>>>>> 1.6.6.2 \n" +
" Created by IntelliJ IDEA. \n" +
" User: $User$ $Id: test2.jsp,v 1.7 2005/06/30 17:32:36 lesya Exp $ \n" +
" $Revision: 1.7 $ \n" +
" Date: Jun 29, 2005 \n" +
" Time: 8:32:37 PM \n" +
" To change this template use File | Settings | File Templates. \n" +
"--%> \n" +
"<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %> \n" +
"<html> \n" +
" <head><title>Simple jsp page</title></head> \n" +
" <body>Place your content here</body> \n" +
"</html> ",
"<%-- \n" +
"change 5.5 \n" +
" Created by IntelliJ IDEA. \n" +
" User: $User$ $Id: test2.jsp,v 1.7 2005/06/30 17:32:36 lesya Exp $ \n" +
" $Revision: 1.7 $ \n" +
" Date: Jun 29, 2005 \n" +
" Time: 8:32:37 PM \n" +
" To change this template use File | Settings | File Templates. \n" +
"--%> \n" +
"<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %> \n" +
"<html> \n" +
" <head><title>Simple jsp page</title></head> \n" +
" <body>Place your content here</body> \n" +
"</html> ",
"<%-- \n" +
" Created by IntelliJ IDEA. \n" +
" User: $User$ $Id: test2.jsp,v 1.7 2005/06/30 17:32:36 lesya Exp $ \n" +
" $Revision: 1.7 $ \n" +
" Date: Jun 29, 2005 \n" +
" Time: 8:32:37 PM \n" +
" To change this template use File | Settings | File Templates. \n" +
"--%> \n" +
"<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %> \n" +
"<html> \n" +
" <head><title>Simple jsp page</title></head> \n" +
" <body>Place your content here</body> \n" +
"</html> ",
"<%-- \n" +
"<<<<<<< test2.jsp \n" +
"<<<<<<< test2.jsp \n" +
"change 6 \n" +
"=======\n" +
"change 3 \n" +
">>>>>>> 1.6.6.1 \n" +
"=======\n" +
"change 2 \n" +
">>>>>>> 1.6.4.1 \n" +
" Created by IntelliJ IDEA. \n" +
" User: $User$ $Id: test2.jsp,v 1.7 2005/06/30 17:32:36 lesya Exp $ \n" +
" $Revision: 1.7 $ \n" +
" Date: Jun 29, 2005 \n" +
" Time: 8:32:37 PM \n" +
" To change this template use File | Settings | File Templates. \n" +
"--%> \n" +
"<%@ page contentType=\"text/html;charset=UTF-8\" language=\"java\" %> \n" +
"<html> \n" +
" <head><title>Simple jsp page</title></head> \n" +
" <body>Place your content here</body> \n" +
"</html> "
);
}