https://bugzilla.wikimedia.org/show_bug.cgi?id=980
Bawolff (Brian Wolff) <bawolff...@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |bawolff...@gmail.com --- Comment #4 from Bawolff (Brian Wolff) <bawolff...@gmail.com> --- Note normal conflict edit resolution doesnt care about sections... (it feeds the entire thing to gnu diff3) It sounds like what is being asked for is a nicer edit conflict screen. The current version certainly could use work. -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes. _______________________________________________ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l