Aaron Schrab 4d6d247d01 No multiple arguments for merge ... `git merge` should only be given multiple arguments if doing an octopus merge which isn't currently supported. Require that exactly one argument be given, and always use HEAD as the currentLocation.		2013-02-20 22:46:45 -05:00
..
js	No multiple arguments for merge	2013-02-20 22:46:45 -05:00
levels	Target branch can't be second argument to merge	2013-02-20 22:45:03 -05:00
style	better padding for vis and stuff	2013-02-18 14:29:43 -08:00
template.index.html	stuff	2013-01-21 20:31:04 -08:00