[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-devel] "shell merge" for binary files
From: |
Lapo Luchini |
Subject: |
[Monotone-devel] "shell merge" for binary files |
Date: |
Mon, 23 Jan 2006 22:24:49 +0100 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.6) Gecko/20050317 Thunderbird/1.0.2 Mnenhy/0.7.2.0 |
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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-devel] "shell merge" for binary files,
Lapo Luchini <=