Commit Graph

3 Commits

Author SHA1 Message Date
Edward Thomson
629b661caa checkout (from index) can write conflicts 2013-10-16 16:20:06 -04:00
nulltoken
1fed6b07f0 Fix trailing whitespaces 2013-05-15 22:41:30 +02:00
Edward Thomson
bec65a5e99 merge! 2013-04-30 15:31:31 -05:00