Skip to content

Move the index to cffi and add conflict information #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdavid merged 7 commits into from
Jul 10, 2014
Merged

Move the index to cffi and add conflict information #389

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
97ee7ab
Move Index to cffi
carlosmn Jul 8, 2014
1985a95
Add looking up conflicts in an Index
carlosmn Jul 9, 2014
78d8014
Move merge tests to their own file
carlosmn Jul 9, 2014
15576fc
Add tests for Index conflict access
carlosmn Jul 9, 2014
5ed9eb4
Add documentation for conflicts and fixup Index
carlosmn Jul 10, 2014
ae32ad1
Support del in ConflictCollection
carlosmn Jul 10, 2014
7f922ae
Make python3 happy
carlosmn Jul 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Make python3 happy
  • Loading branch information
@carlosmn
carlosmn committed Jul 10, 2014
commit 7f922ae9d982cfd3b13f842c213667cdf4ee8ed6
2 changes: 1 addition & 1 deletion src/diff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ PyMappingMethods Diff_as_mapping = {
static PyMethodDef Diff_methods[] = {
METHOD(Diff, merge, METH_VARARGS),
METHOD(Diff, find_similar, METH_VARARGS),
METHOD(Diff, from_c, METH_STATIC),
METHOD(Diff, from_c, METH_STATIC | METH_VARARGS),
{NULL}
};

Expand Down