01a2d8d38d
Create a ReferenceCollection for managing references
...
As with the other commits, this clears up the clutter in naming and
around the Repository's API.
2015-06-28 01:12:32 +02:00
e300945a3d
tests: always clean up temporary repository dirs
...
Some test repositories are not correctly removed after the tests
did run. Fix by introducing a function that is to be used for
cleaning up temporary test repositories.
2015-04-24 13:01:51 +02:00
1d759e3697
Update to master
2014-12-03 17:26:55 +01:00
ff65faa082
Fix MergeTrees func to accept nil as ancestor parameter
2014-11-08 19:07:21 -05:00
7906bdbdce
Merge: merge analysis now returns the user's preference
2014-05-31 16:47:35 +02:00
0b48ba2224
Merge analysis and merge file
2014-03-26 14:42:01 -07:00
eff3a8b4d0
support nil merge options
2014-03-26 12:17:23 -07:00
50a3c4aa09
update to new merge API
2014-03-26 11:28:48 -07:00
e5946d4009
Add defaults, add simple test, merge heads should be pointer array
2014-02-28 14:33:38 -08:00
Carlos Martín Nieto
Patrick Steinhardt
joseferminj
Jesse Ezell