[TxMt] Re: Combined diff and source code highlighting