Menu

Tree [fcce27] default tip /
 History

Read Only access


File Date Author Commit
 README.md 2017-01-31 Stefan Beckert Stefan Beckert [fcce27] Update repository links and copyright year
 sbdiff 2017-01-31 Stefan Beckert Stefan Beckert [fcce27] Update repository links and copyright year
 sbdiff.png 2015-08-23 Stefan Beckert Stefan Beckert [1ac6a4] Add image
 sbdiffhg.rc 2015-08-25 Stefan Beckert Stefan Beckert [be4b9d] Improve doc and Mercurial integration

Read Me

sbdiff

sbdiff is a frontend for (GNU) diff.

It compares files and directories line by line, outputs the files side-by-side in two columns and colorizes the differences.
Because it is a console application, no GUI is necessary.

The code is available at:

Install

In order to use it, you need Lua 5.2 or newer and the diff command in your PATH.

Then just copy the file sbdiff e.g. to /usr/local/bin/.

Standalone Usage

Type sbdiff foo bar to see the differences between file foo and file bar or directory foo and directory bar.

Integration into Mercurial

  • Per user: Append the file sbdiffhg.rc to your $HOME/.hgrc
  • Or for all users: Copy sbdiffhg.rc into /etc/mercurial/hgrc.d/

Then you can use sbdiff within your Mercurial projects as external diff command:

hg sbdiff ...

Integration into Git

Run the following commands: (This will change $HOME/.gitconfig)

git config --global diff.tool sbdiff
git config --global difftool.sbdiff.cmd 'sbdiff $LOCAL $REMOTE'
git config --global difftool.prompt false

Then you can use sbdiff within your Git projects as external diff command:

git difftool ...

Misc

If you like this tool drop me a note on sourceforge.

If you find a bug, leave me a ticket.

Todo

Fix position of "no line feed at EOF" message