Is there a way to diff two non-repo files?

[ctesmer]

Is there a way to select two arbitrary files and diff them? Am I missing how to do that? I’d like to ditch Kaleidoscope—even though it’s been a great tool.

E.g. I can do this in the command line with Kaleidoscope:

$ ksdiff file1.txt file2.txt

Kaleidoscope will then fire up, showing the diff between the two files.

[kingkeith]

smerge mergetool file1 file2

[ctesmer]

So cool! Thank you.

For anyone finding this thread, I wrote instructions to add smerge to your path.

[AmjadHD]

smerge mergetool file1 file2

that doesn’t compare character changes, only entire lines.