Finally found something semi-bearable for hg merge