void (String line, Key outputType) { if (myLocalChangesError) { myOutput.add(line); } else if (line.contains("Automatic merge failed; fix conflicts and then commit the result")) { myMergeError = MergeError.CONFLICT; } else if (line.contains("Your local changes to the following files would be overwritten by merge")) { myMergeError = MergeError.LOCAL_CHANGES; myLocalChangesError = true; } }