Handle the case of a parent being listed twice in a merge.
tree2d09f24440eddb71ebaf9b273b2c482b2b5485cc
-rwxr-xr-x 44953 gitk