On 28 February 2011 17:07, Piotr Piastucki <[email protected]> wrote: > Hi, > It looks like auto-merge mode has been broken since commit > 0463dbe092c19ce8b6e54f56a726cc698b5a466d, because of an empty text buffer > used for file comparison in _merge_files method. > I have also spotted another bug in merge module where an undefined variable > is used. > The attached patch fixes both issues and slightly simplifies the code in > filemerge module.
I split this into two patches and committed the result. Thanks for keeping watch over merging support. On a related note, I had been wondering whether some of FileMerge's textbuffer complications could be dealt with using the same mechanism that was added to support the --output command line flag in the following commit: http://git.gnome.org/browse/meld/commit/?id=f48e05bf4e7532996a19376fd754f2cce4eaf7d5 Any thoughts? cheers, Kai _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
