Code

Merge with gitk --parents change.