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