delta/libgit2.git/tests/merge/trees, branch cmn/diff-binary-patch github.com: libgit2/libgit2.git introduce `git_index_entry_is_conflict` 2015-05-28T13:47:31+00:00 Edward Thomson ethomson@microsoft.com 2015-05-19T15:23:59+00:00 9f545b9d71c7bd316be80e5fe8b47135e9deb97e It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking. 
It's not always obvious the mapping between stage level and
conflict-ness.  More importantly, this can lead otherwise sane
people to write constructs like `if (!git_index_entry_stage(entry))`,
which (while technically correct) is unreadable.

Provide a nice method to help avoid such messy thinking.
merge: merge iterators 2015-05-11T18:11:56+00:00 Edward Thomson ethomson@microsoft.com 2015-02-19T03:53:40+00:00 9ebb5a3ff31a58a25714fbc98704b0fda0982cdb 






Collapse whitespace flags into git_merge_file_flags_t
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-12T10:36:09+00:00

13de93631664cd6eec3afedabb7145d5562a3e01












Renamed git_merge_options 'flags' to 'tree_flags'
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-12T10:29:47+00:00

f29dde682866c293292ce405fcfef1511ced3f55












Added tests to merge files and branches with whitespace problems and fixes
2015-03-16T07:53:27+00:00

Jacques Germishuys
jacquesg@striata.com

2015-03-09T15:03:03+00:00

0f24cac2b926e4842f6890ee1712ac2d85cc020c












hashsig: Export as a `sys` header
2014-10-01T10:03:24+00:00

Vicent Marti
tanoku@gmail.com

2014-10-01T10:03:24+00:00

737b505116f263653ef4f0c80d888b1a87187a2b












Introduce cl_assert_equal_oid
2014-07-01T18:40:16+00:00

Edward Thomson
ethomson@edwardthomson.com

2014-07-01T18:09:01+00:00

0cee70ebb7297f155129e0d05f5a23be82231256












Update git_merge_tree_opts to git_merge_options
2014-03-20T16:25:08+00:00

Edward Thomson
ethomson@microsoft.com

2014-03-12T05:47:39+00:00

5aa2ac6de1622308884fd542f7b29e6810a0e98e












Introduce git_merge_file for consumers
2014-03-20T16:25:05+00:00

Edward Thomson
ethomson@edwardthomson.com

2014-03-11T06:30:41+00:00

05d47768caf6fec51fa85cb6275c9ba8324aead6












index: rename an entry's id to 'id'
2014-01-25T07:15:44+00:00

Carlos Martín Nieto
cmn@dwim.me

2014-01-24T10:36:41+00:00

d541170c77b7ac738e2ffcdd04c838fb7cbbfb87

This was not converted when we converted the rest, so do it now.





This was not converted when we converted the rest, so do it now.