Eskil

Differences From Artifact [89af30e2dc]:

• 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...]

To Artifact [421e18d585]:

• File Changes — part of check-in [ddfc1ceec8] at 2011-05-09 00:08:06 on branch trunk — Minor correction to clear syntax warning. (user: peter.spjuth@gmail.com size: 7410)

1
2
3
4
5
6
7

1
2
3
4
5
6
7
8
9
10
11

+
+
+
+

2011-05-09
 Rewritten directory diff to use tablelist.
 Redesigned appearance of directory diff.

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.