After marking a p4 branch as merged don't ever merge it in git again.
treeedb48582c7ebbeae2f536f294270e465f9e65771
drwxr-xr-x - contrib