#125 select lines from alll/both files for merge

open
nobody
None
5
2012-09-23
2011-11-16
Anonymous
No

I would like to select a bunch of conflicts, select to use A for them, then B, but without undoing the fact I selected B. You can do this now on a conflict-by-conflict basis but I'm now doing a merge with 1500 conflicts in which I just want the contents of both files together, which is a lot of manual work.

Discussion

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks