Tamara Fleisher 611c2ad872 added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00

..

assets

pulling in code.google.com changes

2012-06-27 23:19:03 -07:00

css

added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00

img

added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00

js

added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00

lib

diff merge tool

2012-07-20 15:15:50 -07:00

tests

added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00

.DS_Store

diff merge tool

2012-07-20 15:15:50 -07:00

main.html

added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00

manifest.json

added keyboard shortcuts. added ability to mark conflicts as resolved.

2012-07-25 09:00:08 -07:00