Reset num_parents to 1 only for merge commits

Also, correct test case to account for the boundary flag