4 Commits

Author	SHA1	Message	Date
Clint Byrum	0dbf2810a0	Add functional tests and examples for merge ... merge.py is undocumented and untested, which is undesirable, as it does not seem to be going away any time soon. Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65	2013-09-19 13:02:03 -07:00
Robert Collins	f733956be8	Ignore built files. ... We don't want someone accidentally committing them. Change-Id: Iec4df61d3b7b1e1bd30f4cbba6b9991062758101	2013-08-12 20:24:26 +12:00
Robert Collins	ae28900681	Ignore editor files. ... Change-Id: I2bf716cae119ccc8a4b4fa6fae4caa7444156526	2013-06-27 15:43:42 +12:00
Joshua McKenty	a6889c1cd3	Initial commit	2013-02-26 07:55:24 -08:00