Projects information

Chunk

Conflicting content
"0-9]+)?(?:/(?:([\\w=?:+/\\[\\]~&%;,._#-]\|(\\([^\\)]\\)))([\\w=?+/~&%-]\|(\\([^\\)]\\))))" + "?)?)\|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", RE.REG_ICASE);/ //fix #73: allow only & entity in url "[\\w$-_.+!'(),\\u0999]+" <<<<<<< HEAD urlRE = Pattern.compile("(?:(?:(?:(?:https?://)\|(?:ftp://)\|(?:www\\.))\|(?:ftp\\.))[a-z0-9.-]+(?:\\.[a-z]+)?(?::[0-9]+)?(?:/(?:([\\w=?+/\\[\\]~%;,._\\#'\\p{InCyrillic}:-]\|(\\([^\\)]\\)))([\\p{InCyrillic}:'\\w=?+/~%-]\|(?:&(?=amp;)[\\w:$_.+!'#(),\\p{InCyrillic}=;-]+)+\|(\\([^\\)]\\))))?)?)\|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", ======= urlRE = Pattern.compile("(?:(?:(?:(?:https?://)\|(?:ftp://)\|(?:www\\.))\|(?:ftp\\.))[a-z0-9.-]+(?:\\.[a-z]+)?(?::[0-9]+)?(?:/(?:([\\w=?+/\\[\\]~%;,._\\#'\\p{InCyrillic}:-]\|(\\([^\\)]\\)))([\\p{InCyrillic}:'\\w=?+/~%-]\|(?:&(?=amp;)[\\w:$_.+!'(),\\p{InCyrillic}=;-]+)+\|(\\([^\\)]*\\))))?)?)\|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", >>>>>>> 17cac02a7aac02e9fbe73dc46c22bd9bd6252be4 Pattern.CASE_INSENSITIVE \| Pattern.UNICODE_CASE); } catch (PatternSyntaxException e) { throw new RuntimeException(e);

Conflicting content

          "0-9]+)?(?:/(?:([\\w=?:+/\\[\\]~&%;,._#-]|(\\([^\\)]*\\)))*([\\w=?+/~&%-]|(\\([^\\)]*\\))))" +
          "?)?)|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", RE.REG_ICASE);*/
      //fix #73: allow only & entity in url    "[\\w$-_.+!*'(),\\u0999]+"
<<<<<<< HEAD
        urlRE = Pattern.compile("(?:(?:(?:(?:https?://)|(?:ftp://)|(?:www\\.))|(?:ftp\\.))[a-z0-9.-]+(?:\\.[a-z]+)?(?::[0-9]+)?(?:/(?:([\\w=?+/\\[\\]~%;,._\\#'\\p{InCyrillic}:-]|(\\([^\\)]*\\)))*([\\p{InCyrillic}:'\\w=?+/~%-]|(?:&(?=amp;)[\\w:$_.+!*'#(),\\p{InCyrillic}=;-]+)+|(\\([^\\)]*\\))))?)?)|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)",
=======
        urlRE = Pattern.compile("(?:(?:(?:(?:https?://)|(?:ftp://)|(?:www\\.))|(?:ftp\\.))[a-z0-9.-]+(?:\\.[a-z]+)?(?::[0-9]+)?(?:/(?:([\\w=?+/\\[\\]~%;,._\\#'\\p{InCyrillic}:-]|(\\([^\\)]*\\)))*([\\p{InCyrillic}:'\\w=?+/~%-]|(?:&(?=amp;)[\\w:$_.+!*'(),\\p{InCyrillic}=;-]+)+|(\\([^\\)]*\\))))?)?)|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)",
>>>>>>> 17cac02a7aac02e9fbe73dc46c22bd9bd6252be4
        Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
    } catch (PatternSyntaxException e) {
      throw new RuntimeException(e);

Solution content
"0-9]+)?(?:/(?:([\\w=?:+/\\[\\]~&%;,._#-]\|(\\([^\\)]\\)))([\\w=?+/~&%-]\|(\\([^\\)]\\))))" + "?)?)\|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", RE.REG_ICASE);/ //fix #73: allow only & entity in url "[\\w$-_.+!'(),\\u0999]+" urlRE = Pattern.compile("(?:(?:(?:(?:https?://)\|(?:ftp://)\|(?:www\\.))\|(?:ftp\\.))[a-z0-9.-]+(?:\\.[a-z]+)?(?::[0-9]+)?(?:/(?:([\\w=?+/\\[\\]~%;,._\\#'\\p{InCyrillic}:-]\|(\\([^\\)]\\)))([\\p{InCyrillic}:'\\w=?+/~%-]\|(?:&(?=amp;)[\\w:$_.+!'#(),\\p{InCyrillic}=;-]+)+\|(\\([^\\)]*\\))))?)?)\|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", Pattern.CASE_INSENSITIVE \| Pattern.UNICODE_CASE); } catch (PatternSyntaxException e) { throw new RuntimeException(e);

Solution content

          "0-9]+)?(?:/(?:([\\w=?:+/\\[\\]~&%;,._#-]|(\\([^\\)]*\\)))*([\\w=?+/~&%-]|(\\([^\\)]*\\))))" +
          "?)?)|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)", RE.REG_ICASE);*/
      //fix #73: allow only & entity in url    "[\\w$-_.+!*'(),\\u0999]+"
        urlRE = Pattern.compile("(?:(?:(?:(?:https?://)|(?:ftp://)|(?:www\\.))|(?:ftp\\.))[a-z0-9.-]+(?:\\.[a-z]+)?(?::[0-9]+)?(?:/(?:([\\w=?+/\\[\\]~%;,._\\#'\\p{InCyrillic}:-]|(\\([^\\)]*\\)))*([\\p{InCyrillic}:'\\w=?+/~%-]|(?:&(?=amp;)[\\w:$_.+!*'#(),\\p{InCyrillic}=;-]+)+|(\\([^\\)]*\\))))?)?)|(?:mailto: ?[a-z0-9+]+@[a-z0-9.-]+.[a-z]+)",
        Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
    } catch (PatternSyntaxException e) {
      throw new RuntimeException(e);

File
HTMLFormatter.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content
private static final String GUARANTEED_CRASH = "\"http://www.google.com/\""; private static final String LINK_WITH_UNDERSCORE = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&num=1"; <<<<<<< HEAD private static final String LINK_WITH_PARAM_ONLY = "http://www.phoronix.com/scan.php?page=article#anchor"; private static final String RFC1738 = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&Мама_мыла_раму&$-_.+!'(,)=$-_.+!'(),#anchor"; ======= private static final String LINK_WITH_PARAM_ONLY = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&num"; private static final String RFC1738 = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&Мама_мыла_раму&$-_.+!'(,)=$-_.+!'(),"; >>>>>>> 17cac02a7aac02e9fbe73dc46c22bd9bd6252be4 private static final String CYR_LINK = "http://ru.wikipedia.org/wiki/Литературный_'негр'(Fran\u00C7ais\u0152uvre_\u05d0)?негр=эфиоп&эфиоп"; private static final String GOOGLE_CACHE = "http://74.125.95.132/search?q=cache:fTsc8ze3IxIJ:forum.springsource.org/showthread.php%3Ft%3D53418+spring+security+openid&cd=1&hl=en&ct=clnk&gl=us";

Conflicting content

  private static final String GUARANTEED_CRASH = "\"http://www.google.com/\"";

  private static final String LINK_WITH_UNDERSCORE = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&num=1";
<<<<<<< HEAD
  private static final String LINK_WITH_PARAM_ONLY = "http://www.phoronix.com/scan.php?page=article#anchor";
  private static final String RFC1738 = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&Мама_мыла_раму&$-_.+!*'(,)=$-_.+!*'(),#anchor";
=======
  private static final String LINK_WITH_PARAM_ONLY = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&num";
  private static final String RFC1738 = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&Мама_мыла_раму&$-_.+!*'(,)=$-_.+!*'(),";
>>>>>>> 17cac02a7aac02e9fbe73dc46c22bd9bd6252be4
  private static final String CYR_LINK = "http://ru.wikipedia.org/wiki/Литературный_'негр'(Fran\u00C7ais\u0152uvre_\u05d0)?негр=эфиоп&эфиоп";
  private static final String GOOGLE_CACHE = "http://74.125.95.132/search?q=cache:fTsc8ze3IxIJ:forum.springsource.org/showthread.php%3Ft%3D53418+spring+security+openid&cd=1&hl=en&ct=clnk&gl=us";

Solution content
private static final String GUARANTEED_CRASH = "\"http://www.google.com/\""; private static final String LINK_WITH_UNDERSCORE = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&num=1"; private static final String LINK_WITH_PARAM_ONLY = "http://www.phoronix.com/scan.php?page=article#anchor"; private static final String RFC1738 = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&Мама_мыла_раму&$-_.+!'(,)=$-_.+!'(),#anchor"; private static final String CYR_LINK = "http://ru.wikipedia.org/wiki/Литературный_'негр'(Fran\u00C7ais\u0152uvre_\u05d0)?негр=эфиоп&эфиоп"; private static final String GOOGLE_CACHE = "http://74.125.95.132/search?q=cache:fTsc8ze3IxIJ:forum.springsource.org/showthread.php%3Ft%3D53418+spring+security+openid&cd=1&hl=en&ct=clnk&gl=us";

Solution content

  private static final String GUARANTEED_CRASH = "\"http://www.google.com/\"";

  private static final String LINK_WITH_UNDERSCORE = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&num=1";
  private static final String LINK_WITH_PARAM_ONLY = "http://www.phoronix.com/scan.php?page=article#anchor";
  private static final String RFC1738 = "http://www.phoronix.com/scan.php?page=article&item=intel_core_i7&Мама_мыла_раму&$-_.+!*'(,)=$-_.+!*'(),#anchor";
  private static final String CYR_LINK = "http://ru.wikipedia.org/wiki/Литературный_'негр'(Fran\u00C7ais\u0152uvre_\u05d0)?негр=эфиоп&эфиоп";
  private static final String GOOGLE_CACHE = "http://74.125.95.132/search?q=cache:fTsc8ze3IxIJ:forum.springsource.org/showthread.php%3Ft%3D53418+spring+security+openid&cd=1&hl=en&ct=clnk&gl=us";

File
HTMLFormatterTest.java

Developer's decision
Version 1

Kind of conflict
Attribute

Projects >> lorsource >>32c9f70e0a723a419ce368d72721054831e40b84