The "Add Manual Diff Alignment" in KDiff3 doesn't seem to do anything. The online documentation is rather sparse.
Does this function actually work?
Asked
Active
Viewed 5,754 times
45
-
5Don't use Ctrl-Y to do manual alignment during a merge. You will lose all of your merges. – Steve Nov 24 '15 at 19:55
-
3using Ctrl-Y during a merge seems to be fine as long as you do it before you start merging. – Lynden Shields Nov 15 '17 at 05:44
1 Answers
74
Ok, I figured it out.
To add manual diff alignment in KDiff3:
- Put the cursor at the beginning of some text in one child window
- Hit Ctrl+Y
- Put the cursor at the beginning of some text in another child window
- Hit Ctrl+Y
GaTechThomas
- 4,195
- 3
- 32
- 52
-
Can you add more details? Which line should I select? I tried selecting lines which were different, but should line up, and also tried selecting lines which were the same, but should line up. Didn't notice any change to the diff. – Jayen Nov 14 '17 at 00:06
-
2It has been a while, but IIRC it works to click at the beginning of the text to compare and not have any text selected. – GaTechThomas Nov 15 '17 at 01:16
-
Is there a way to have more than one such alignment? I'm struggling and keep having to start from scratch. – leokhorn Jan 18 '19 at 16:34
-
Not that I'm aware of. I've been using BeyondCompare for several years now, and it's quite rich in features. May be what you need, and it has a pretty generous trial period. – GaTechThomas Jan 19 '19 at 21:05
-
1I know this is an old post, but I just faced this problem in kdiff3, and you can use this technique in multiple places in the same document. – phatfingers Jun 04 '20 at 15:13