Search found 1 match
- Wed Oct 30, 2019 2:07 pm
- Forum: Support (DiffMerge)
- Topic: Apply BOTH versions of a change?
- Replies: 1
- Views: 16013
Apply BOTH versions of a change?
I will often have a chunk of code, and one person added a line, and another person added a totally different line at the same place. I want both of them. So, the original file is: Foo Bar Version 1 is: Foo BAZ Bar Version 2 is: Foo BUQ Bar The merged version I want is: Foo BAZ BUQ Bar (typically, I ...