Commit 7a74590d8f952971088a90c584945ceefe1bf90e

Stan Hu 2015-12-03T09:57:56

Fix rebase bug and include test for merge=union