Commit graph

2 commits

Author SHA1 Message Date
Federico Hernandez
f2f590e193 Unit test
- disabled unit test that requires faketime
  which is not available on Mac OS X
2011-02-16 23:38:08 +01:00
Johannes Schlatow
ea57b560d9 Bug
* fixed bug in merge command where the first match of a uuid in
  pending.data was on the depends attribute
2011-02-13 01:51:34 +01:00