Fix merge tests

Blobs, trees and commits seems now able be merged without (knonw) bugs.
Need to write the high-level API now and plug it to the CLI.