<     SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2)) should return x as the common ancestor of v1 and v2
<   ․ SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2)) should return x as the common ancestor of v1 and v2
<     SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2)) should return either v1 or v2 as V1, and the other as V2
<   ․ SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2)) should return either v1 or v2 as V1, and the other as V2
<     SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2)) should set V1 and V2 such that the path between x and V2 is lighter than from x to V1
<   ․ SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2)) should set V1 and V2 such that the path between x and V2 is lighter than from x to V1
---
>     SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2, mergeInfo)) should return x as the common ancestor of v1 and v2
>   ․ SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2, mergeInfo)) should return x as the common ancestor of v1 and v2
>     SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2, mergeInfo)) should return either v1 or v2 as V1, and the other as V2
>   ․ SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2, mergeInfo)) should return either v1 or v2 as V1, and the other as V2
>     SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2, mergeInfo)) should set V1 and V2 such that the path between x and V2 is lighter than from x to V1
>   ․ SimpleVersionGraph .getMergeStrategy(v1, v2, cb(err, V1, x, V2, mergeInfo)) should set V1 and V2 such that the path between x and V2 is lighter than from x to V1
191a192,195
>     SimpleVersionGraph .getPatches(v1, v2, cb(err, patches)) should expand patches that result from previous merges
>   ․ SimpleVersionGraph .getPatches(v1, v2, cb(err, patches)) should expand patches that result from previous merges
>     SimpleVersionGraph .recordMerge(mergeInfo, newV, cb(err)) should record a merge using the mergeInfo object obtained from getMergeStrategy(), and a merged version
>   ․ SimpleVersionGraph .recordMerge(mergeInfo, newV, cb(err)) should record a merge using the mergeInfo object obtained from getMergeStrategy(), and a merged version
243c247
<   120 passing (5s)
---
>   122 passing (6s)