[PATCH] conflict solver mode


I've been working on turning meld into a convenient conflict solver (i.e. adding auto merge with ancestor) for a couple of days. I submitted a patch with the very first version of this feature here:
http://bugzilla.gnome.org/show_bug.cgi?id=578613 <http://bugzilla.gnome.org/show_bug.cgi?id=576934>

There are still a couple of things I would like to add e.g. an option to ignore whitespace changes and an indicator of the number of unresolved conflicts.

I will be grateful for any comments.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]