Comments on: BASH: Open FileMerge from CLI http://muffinresearch.co.uk/archives/2007/08/16/bash-open-filemerge-from-cli/ the personal blog of Stuart Colville covering modern web development techniques and best practices Thu, 09 Feb 2012 02:58:03 +0000 hourly 1 http://wordpress.org/?v=3.3.1 By: Stuart Colville http://muffinresearch.co.uk/archives/2007/08/16/bash-open-filemerge-from-cli/comment-page-1/#comment-58503 Stuart Colville Tue, 04 Sep 2007 14:39:12 +0000 http://muffinresearch.co.uk/archives/2007/08/16/bash-open-filemerge-from-cli/#comment-58503 That would be pretty easy; add to .bashrc: <pre><code>function bzrdiff { if [ $# -lt 1 ] then cat <<-END Usage: bzrdiff file Will automatically compare file.OTHER and file.THIS END else opendiff $1.OTHER $1.THIS -ancestor $1.BASE fi }</code></pre> remember to <code>source ~/.bashrc</code> for changes to take effect. That would be pretty easy; add to .bashrc:

function bzrdiff {
if [ $# -lt 1 ]
then
cat <<-END
        Usage: bzrdiff file
        Will automatically compare file.OTHER and file.THIS
END
else
  opendiff $1.OTHER $1.THIS -ancestor $1.BASE
fi
}

remember to source ~/.bashrc for changes to take effect.

]]> By: Ben Ward http://muffinresearch.co.uk/archives/2007/08/16/bash-open-filemerge-from-cli/comment-page-1/#comment-58502 Ben Ward Tue, 04 Sep 2007 13:31:22 +0000 http://muffinresearch.co.uk/archives/2007/08/16/bash-open-filemerge-from-cli/#comment-58502 So, whilst this should be an exercise for the reader, what we'd want is an alias to act like this: <code>bzrmerge path/to/file.ex</code> Automatically open FileMerge and fill in the .THIS, .OTHER and .BASE files for us. Must. Learn. Bash. So, whilst this should be an exercise for the reader, what we’d want is an alias to act like this:

bzrmerge path/to/file.ex

Automatically open FileMerge and fill in the .THIS, .OTHER and .BASE files for us.

Must. Learn. Bash.

]]>