tests-clar/merge


Log

Author Commit Date CI Message
nulltoken c4ac556e 2013-06-29T12:48:58 Fix compilation warnings
Russell Belfer 114f5a6c 2013-06-10T10:10:39 Reorganize diff and add basic diff driver This is a significant reorganization of the diff code to break it into a set of more clearly distinct files and to document the new organization. Hopefully this will make the diff code easier to understand and to extend. This adds a new `git_diff_driver` object that looks of diff driver information from the attributes and the config so that things like function content in diff headers can be provided. The full driver spec is not implemented in the commit - this is focused on the reorganization of the code and putting the driver hooks in place. This also removes a few #includes from src/repository.h that were overbroad, but as a result required extra #includes in a variety of places since including src/repository.h no longer results in pulling in the whole world.
Edward Thomson 9c06b250 2013-05-16T13:04:37 merge setup
nulltoken 1fed6b07 2013-05-13T21:57:37 Fix trailing whitespaces
Russell Belfer 0f938c6b 2013-05-07T09:59:53 Fix win32 type warnings
Edward Thomson 5e151329 2013-05-02T15:19:49 braces
Edward Thomson 4e7c1560 2013-05-02T14:58:40 puns are not funny; type punning especially so
Vicent Marti e1807113 2013-05-01T15:31:23 merge: Warning noise
Edward Thomson 75d1c8c6 2013-04-30T17:33:11 move NAME and REUC extensions to sys/
Edward Thomson 0462fba5 2013-04-30T14:56:41 renames!
Edward Thomson bec65a5e 2013-04-01T22:16:21 merge!
Vicent Marti a7ffd936 2013-01-04T17:46:38 clar: fix merge/setup.c
Edward Thomson 5a62d659 2013-01-03T12:44:09 MERGE_HEAD contents iterator
Edward Thomson 42e50b5e 2013-01-03T12:44:09 MERGE_HEAD contents iterator