Eskil

Differences From Artifact [685b8e3e5f]:

• File Changes — part of check-in [e64e1eb72f] at 2012-08-30 20:42:55 on branch trunk — Corrected display of ancestor lines in three-way merge. (user: peter size: 9143)

To Artifact [a5ec1381e1]:

• File Changes — part of check-in [b00c9a362f] at 2012-10-03 23:18:35 on branch trunk — Adapted syntax check to updated Nagelfar package handling. (user: peter size: 9255)

1
2
3
4
5
6
7

1
2
3
4
5
6
7
8
9
10
11

+
+
+
+

2012-09-17
 Avoid getting double .-files in dirdiff on Windows.
 Added "nice" option to control dirdiff speed.

2012-08-30
 Corrected display of ancestor lines in three-way merge.

2012-08-21
 Bumped revision to 2.6.3

2012-08-21