6 Commits

Author	SHA1	Message	Date
Tamara Fleisher	1dbacaa5d1	history of all recent files. display path if filename is the same.	2012-07-27 12:50:17 -07:00
Tamara Fleisher	611c2ad872	added keyboard shortcuts. added ability to mark conflicts as resolved.	2012-07-25 09:00:08 -07:00
Tamara Fleisher	8a7f73d880	diff merge tool	2012-07-20 15:15:50 -07:00
Tamara Fleisher	1d8d488da8	files can be edited and saved	2012-07-03 09:04:36 -07:00
Eric Bidelman	bb77904419	pulling in code.google.com changes	2012-06-27 23:19:03 -07:00
Eric Bidelman	c6422f6acb	Init commit of samples	2012-06-27 12:59:19 -07:00