| Chunk |
|---|
| Conflicting content |
|---|
* Character to be changed to.
*/
public static String customizePath(String str, char from_char, char to_char) {
<<<<<<< HEAD
StringBuilder strbuf = new StringBuilder();
int beg = 0, end = 0;
=======
StringBuffer strbuf = new StringBuffer();
int beg = 0, end;
>>>>>>> 45b4fb1313b6ff0149c1d61f597395985c8b2ff9
while(-1 != (end = str.indexOf(from_char, beg))) {
strbuf.append(str.substring(beg, end));
strbuf.append(to_char); |
| Solution content |
|---|
* Character to be changed to.
*/
public static String customizePath(String str, char from_char, char to_char) {
StringBuilder strbuf = new StringBuilder();
int beg = 0, end;
while(-1 != (end = str.indexOf(from_char, beg))) {
strbuf.append(str.substring(beg, end));
strbuf.append(to_char); |
| File |
|---|
| FileEntry.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |
| Variable |