"Batteries Included" windows installer

[Bela Babik]

> * I tried to use csdiff but I couldn't figure out how to make it do a three
> way merge or the "change selection" feature that qct needs.  TortoiseMerge
> can perform both tasks, if a bit clumsily.

What is this change selection function?
kdiff3 can do automatic merges if that's what you need:
help: kdiff3 -h
merge:  -m
no gui if there are no conflicts: --auto