After marking a p4 branch as merged don't ever merge it in git again.
authorSimon Hausmann <simon@lst.de>
Mon, 12 Feb 2007 20:44:02 +0000 (21:44 +0100)
committerSimon Hausmann <simon@lst.de>
Mon, 12 Feb 2007 20:44:02 +0000 (21:44 +0100)
commit53b03239aa899677bcadf69f757354b72797e457
treeedb48582c7ebbeae2f536f294270e465f9e65771
parentdcacf8b447be74efaa5335f42c502ee1c397c436
After marking a p4 branch as merged don't ever merge it in git again.

Signed-off-by: Simon Hausmann <simon@lst.de>
contrib/fast-import/p4-fast-export.py