Incorrect kdiff3 arguments during merge with no base
Created originally on Bitbucket by Anonymous
TO REPRODUCE: Create 2 disjoint repos and attempt to merge them with the "force" option. When resolving conflicts, kdiff3 will be launched with the following settings:
- A =
- B = parent1
- C = parent2
Notice that there is no (A = base). This causes merge problems. A is blank, but its EOL encoding is set Unix, while B and C are set to DOS. Try merging the following files set as B and C in kdiff3 but leave A blank:
- File B:
Line1 Line1
Line2 Line2
Line3 Line3
Line4 Line4
Line5 Line5
- File C:
Line1 Line1
Line2 Line2
Line3 Line3
Line4 Line4
Line5 Line5
Files B and C differ only by a blank new line. Kdiff3 will create huge conflicts, where in fact it should create none. You might say, that this is a kdiff3 bug and not tortoisehg. However I am posting it as a bug here, because tortoisehg can fix it. When there is no base, kdiff3 should be executed in the following way:
- A = parent1
- B = parent2
- C =
Attachments: SampleRepo.zip