Projects >> ideavim >>72537c6ffb04e69cce61aaaa79da5da96fbe321a

Chunk
Conflicting content 
           "\none\n\ntwo\n\nthree\n");
  }

<<<<<<< HEAD
  // VIM-864 |:substitute|
  public void testVisualSubstituteDoesntChangeVisualMarks() {
    myFixture.configureByText("a.java", "foo\nbar\nbaz\n");
    typeText(parseKeys("V", "j", ":'<,'>s/foo/fuu/", "gv", "~"));
    myFixture.checkResult("FUU\nBAR\nbaz\n");
=======
  public void testOffsetRange() {
    doTest(".,+2s/a/b/g",
           "aaa\naaa\naaa\naaa\naaa\n",
           "aaa\nbbb\nbbb\nbbb\naaa\n");
>>>>>>> 8c0e116a1ca68969a4af521e8f9a03cbb3d11501
  }

  private void doTest(final String command, String before, String after) {
Solution content 
           "\none\n\ntwo\n\nthree\n");
  }

  // VIM-864 |:substitute|
  public void testVisualSubstituteDoesntChangeVisualMarks() {
    myFixture.configureByText("a.java", "foo\nbar\nbaz\n");
    typeText(parseKeys("V", "j", ":'<,'>s/foo/fuu/", "gv", "~"));
    myFixture.checkResult("FUU\nBAR\nbaz\n");
  }

  public void testOffsetRange() {
    doTest(".,+2s/a/b/g",
           "aaa\naaa\naaa\naaa\naaa\n",
           "aaa\nbbb\nbbb\nbbb\naaa\n");
  }

  private void doTest(final String command, String before, String after) {
File
SubstituteCommandTest.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Method signature