2011-05-03 21:16:48
— part of check-in
[973d18ceb6]
on branch trunk
— Added GUI for selecting ancestor
(user:
peter.spjuth@gmail.com
size: 606)
2011-05-03 21:37:47
— part of check-in
[93bf0308fc]
on branch table-list
— Merge branch 'master' into tablelist
(user:
peter.spjuth@gmail.com
size: 606)
File
tests/ancestor.txt
2011-04-30 01:10:17
— part of check-in
[118eb090c6]
on branch trunk
— More merge conflict cases handled
(user:
peter.spjuth@gmail.com
size: 606)
2011-05-03 21:37:47
— part of check-in
[93bf0308fc]
on branch table-list
— Merge branch 'master' into tablelist
(user:
peter.spjuth@gmail.com
size: 606)