Commit 3d1abc5afcee2b878d835df11530aab8ffa0d1e1

Patrick Steinhardt 2016-02-22T17:13:23

xmerge: fix memory leak on error path