Commit f8787098fbc8944afd684ed0e26221e36da2d6f8

Stan Hu 2015-10-31T18:50:13

Support union merges via .gitattributes file