On Oct 3, 2004, at 9:18 PM, Chris Phoenix wrote:
Diffing between 1.3.3 and 1.3.5, it looks like you don't change the database at all. Is that correct?
That's right.
Can anyone recommend me a good diff/merge tool for Windows? I've made a fair number of changes and will make more, and many of them (like the article/category blurring) will never make it into the distro, so I'll have to merge my changes forward each time I update.
Sorry, can't help here. If it were me I'd just use the standard Unix 'diff' and 'patch' tools under Cygwin...
-- brion vibber (brion @ pobox.com)