Eskil

Timeline
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

5 check-ins using file src/merge.tcl version eb40c655f8

2011-04-28
00:55
Added test for merge check-in: fcbb229077 user: peter.spjuth@gmail.com tags: trunk
00:21
Code cleanup to get clean Nagelfar run check-in: 4d66d4009f user: peter.spjuth@gmail.com tags: trunk
2011-04-27
23:13
Added -fine option for fine grained change chunks, useful for merging. check-in: 35053e21fc user: peter.spjuth@gmail.com tags: trunk
22:20
Restructured code to let insertMatchingBlocks handle puting changes in the change list. check-in: bd368726a8 user: peter.spjuth@gmail.com tags: trunk
2011-04-25
15:58
3-way diff now handles basic cases. check-in: 674c783efa user: peter.spjuth@gmail.com tags: trunk