Who we are

We are the developers of Plastic SCM, a full version control stack (not a Git variant). We work on the strongest branching and merging you can find, and a core that doesn't cringe with huge binaries and repos. We also develop the GUIs, mergetools and everything needed to give you the full version control stack.

If you want to give it a try, download it from here.

We also code SemanticMerge, and the gmaster Git client.

Use Unix diff from console

Monday, February 26, 2018 0 Comments

While we invest lots of efforts improving our built-in diff, semantic diff and the graphical merge tools, there are times where you really need to run a diff in a terminal.

How can you configure unix diff to be your diff tool?

Setup your diff tool editing client.conf

All you need to do is to edit your client.conf as follows:

In this case I set up the Unix diff on my Fedora, but of course you could be using sdiff or any other.

Use a separate client.conf for specific purposes

You can simply edit client.conf and modify the diff.

But, if you want to use a different diff for CLI than GUI, then probably you'll be better served by having 2 different client.conf files.

In my case, note I used the following:

cm diff the_file -clientconf=/home/pablo/.plastic4/client.conf.txtdiff

client.conf.txtdiff is the modified client.conf where I setup the command line diff.

Conclusion

Nothing really new under the sun here, just remind you that while we don't ship a console-based diff tool, it takes 1 minute to configure one.

0 comentarios: