[Monotone-devel] "shell merge" for binary files

[Lapo Luchini]

Waiting for the directory-merge feature, I wrote the following script in
order to ease merging binary files:

% cat ~/bin/zshdiff
#!/bin/sh
echo -n Left:
ls -l "$1"
echo -n Right:
ls -l "$2"
echo -n Out:
ls -l "$3"
zsh

To be called with:

function get_preferred_merge3_command (tbl)
   return
   function()
      return execute("zshdiff",
                     tbl.lfile, tbl.rfile, tbl.outfile)
   end
end

Hope this comes handy to someone. It did to me.

    Lapo