Commit Graph

2 Commits

Author SHA1 Message Date
Edward Thomson
3acf44d6cb tests for checkout index with conflicts 2013-10-16 16:20:04 -04:00
Edward Thomson
bec65a5e99 merge! 2013-04-30 15:31:31 -05:00