Commit Graph

13 Commits

Author SHA1 Message Date
Carlos Martín Nieto 668aa5dae1 Make the constants have types
While Go will assign the correct type to a const block when it
auto-creates the values, assigning makes the const be typeless and will
only gain it in each particular use.

Make each constant in the blocks have an assigned type.
2014-10-28 11:29:31 +01:00
Carlos Martín Nieto 7906bdbdce Merge: merge analysis now returns the user's preference 2014-05-31 16:47:35 +02:00
Jesse Ezell 9d8cbe7547 use cast_ptr instead of ptr for travis go tip build 2014-04-04 00:47:21 -07:00
Jesse Ezell 864c57f554 merge latest, copy merge bytes to go array 2014-04-04 00:22:42 -07:00
Jesse Ezell 0b48ba2224 Merge analysis and merge file 2014-03-26 14:42:01 -07:00
Jesse Ezell eff3a8b4d0 support nil merge options 2014-03-26 12:17:23 -07:00
Jesse Ezell 50a3c4aa09 update to new merge API 2014-03-26 11:28:48 -07:00
Jesse Ezell 6a068d5265 remove useless wrappers 2014-03-11 12:47:56 -07:00
Jesse Ezell e5946d4009 Add defaults, add simple test, merge heads should be pointer array 2014-02-28 14:33:38 -08:00
Jesse Ezell 6af4d4a825 move finalizer above free 2014-02-28 11:15:39 -08:00
Jesse Ezell da64faf8bd switch from iota to explicit def 2014-02-28 11:13:51 -08:00
Jesse Ezell 5f5906878e merge options / merge tree options 2014-02-28 01:31:01 -08:00
Jesse Ezell 9e7ba02708 wrap merge functions 2014-02-28 01:06:41 -08:00