To use bbdiff set bbdiff to $TM_SVN_DIFF_CMD in the shell variables. Make sure you install bbdiff from BBEdit.
To use FileMerge, it’s a little complicated. Check out this artcile for the full coverage and keep updated with checking out the bundle from macromates svn repository. In short, you need to download the scripts, do make install them and, then, set fmdiff in the the shell variable.
The problem I get when I use fmdiff is the warning: Files are not ascii. It seems this happens when I deal with some files. I get this error when I work on translation of TextMate manual.
Does this mean the files in question should only contain single-byeter characters. The phrase ASCII files often mean plain texts. It’s likely that this is a problem with FileMerge itself. Anyone know a better GUI diff app?
Comments
FileMerge chokes on unicode.
FileMerge chokes on unicode. Though I use UTF8, I failed to notice this for a long time since I rarely use any characters outside of the ASCII subset.
Yeah. It seems I need to
Yeah. It seems I need to convert to a different encoding. Searching the web told me that Japanese is recognized by FileMerge only when the encoding is Shift-JIS. I haven’t tried, but the script called NKF (Network Kanji Filter) seems to work with FileMerge.
Source: http://hetima.com/pblog/article.php?id=87