equal
deleted
inserted
replaced
69 merged = 0; |
69 merged = 0; |
70 clean_p1 = 0; |
70 clean_p1 = 0; |
71 clean_p2 = 0; |
71 clean_p2 = 0; |
72 possibly_dirty = 0; |
72 possibly_dirty = 0; |
73 parentfiledata = Py_None; |
73 parentfiledata = Py_None; |
74 if (!PyArg_ParseTupleAndKeywords(args, kwds, "iiiiiiiO", keywords_name, |
74 if (!PyArg_ParseTupleAndKeywords(args, kwds, "|iiiiiiiO", keywords_name, |
75 &wc_tracked, &p1_tracked, &p2_tracked, |
75 &wc_tracked, &p1_tracked, &p2_tracked, |
76 &merged, &clean_p1, &clean_p2, |
76 &merged, &clean_p1, &clean_p2, |
77 &possibly_dirty, &parentfiledata |
77 &possibly_dirty, &parentfiledata |
78 |
78 |
79 )) { |
79 )) { |