check-diff-conflicts (npm): checks diff between files and returns the file with the difference with comments to help solve the conflict
Keywords: diff|conflicts