Eskil: Diff

Differences From Artifact [be2778529d]:

File Changes — part of check-in [4d66d4009f] at 2011-04-28 00:21:42 on branch trunk — Code cleanup to get clean Nagelfar run (user: peter.spjuth@gmail.com size: 7018)

File Changes — part of check-in [2f126fd631] at 2011-04-29 23:53:15 on branch trunk — Improved three-way merge (user: peter.spjuth@gmail.com size: 7312) [more...]








1 2 3 4 5 6 7	1 2 3 4 5 6 7 8 9 10 11 12 13 14	+ + + + + + +	2011-04-30 Improved three-way merge. Highlight conflicts and navigate directly between conflicts. Include status for each merge chunk to see the descision made. Added Goto menu in merge window to get fewer toolbar buttons. Autodetect line endings in ancestor file to select merge output. 2011-04-28 Code cleanup to get clean Nagelfar run 2011-04-28 Added three-way merge. Cmd line options -a and -fine. 2011-04-24
︙