431380f8c5
To Initialize `preference` makes no sense
2014-05-29 09:38:40 +04:00
80751baa2a
Fix git_merge_analysis assert
2014-05-29 09:35:48 +04:00
64e9ef8863
Fix
...
* git2go/blob.go:63: cannot use _Ctype_size_t(len(goBuf)) (type C.size_t) as type C.ulong in function argument
* git2go/merge.go:169 git_merge_analysis: now have five arguments
2014-05-29 09:26:50 +04:00
9d8cbe7547
use cast_ptr instead of ptr for travis go tip build
2014-04-04 00:47:21 -07:00
864c57f554
merge latest, copy merge bytes to go array
2014-04-04 00:22:42 -07: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
6a068d5265
remove useless wrappers
2014-03-11 12:47:56 -07:00
e5946d4009
Add defaults, add simple test, merge heads should be pointer array
2014-02-28 14:33:38 -08:00
6af4d4a825
move finalizer above free
2014-02-28 11:15:39 -08:00
da64faf8bd
switch from iota to explicit def
2014-02-28 11:13:51 -08:00
5f5906878e
merge options / merge tree options
2014-02-28 01:31:01 -08:00
9e7ba02708
wrap merge functions
2014-02-28 01:06:41 -08:00
Aguacero
Jesse Ezell