Skip to content

Implementing merge with default options #295

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 9 commits into from
Dec 10, 2013
Merged

Implementing merge with default options #295

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f5ec81
implementing merge with default options
Dec 4, 2013
9955b3e
implementing merge with default options
Dec 4, 2013
1f2fdca
implementing merge with default options - new test
victorgp Dec 4, 2013
6855a59
implementing merge with default options - minor change
victorgp Dec 4, 2013
3cd8fed
implementing merge - some fixes for the pull request: MergeRestul typ…
victorgp Dec 9, 2013
7d9d266
implementing merge: merge.rst doc and implementing MergeResult as a s…
victorgp Dec 9, 2013
1cf6e74
implementing merge: some small fixes in merge.rst
victorgp Dec 9, 2013
0556ab0
implementing merge: removing index field from MergeResult
victorgp Dec 10, 2013
1938147
implementing merge: removing index field from merge.rst
victorgp Dec 10, 2013
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
Next Next commit
implementing merge with default options - minor change
  • Loading branch information
@victorgp
victorgp committed Dec 4, 2013
commit 6855a599e4faa534e0ce24215519d6099c744b57
4 changes: 2 additions & 2 deletions src/mergeresult.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ PyDoc_STRVAR(MergeResult_fastforward_oid__doc__, "Fastforward Oid");
PyObject *
MergeResult_fastforward_oid__get__(MergeResult *self)
{
if (self->is_fastforward == 1)
if (self->is_fastforward)
{
Py_INCREF(self->fastforward_oid);
return self->fastforward_oid;
Expand Down Expand Up @@ -123,7 +123,7 @@ PyTypeObject MergeResultType = {
"_pygit2.MergeResult", /* tp_name */
sizeof(MergeResult), /* tp_basicsize */
0, /* tp_itemsize */
0, /* tp_dealloc */
0, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
Expand Down