Method: Rugged::Index#conflict_remove
- Defined in:
- ext/rugged/rugged_index.c
#conflict_remove(path) ⇒ nil
Removes the index entries that represent the conflict at path
.
790 791 792 793 794 795 796 797 798 799 800 801 802 803 |
# File 'ext/rugged/rugged_index.c', line 790
static VALUE rb_git_conflict_remove(VALUE self, VALUE rb_path)
{
git_index *index;
int error;
Check_Type(rb_path, T_STRING);
Data_Get_Struct(self, git_index, index);
error = git_index_conflict_remove(index, StringValueCStr(rb_path));
rugged_exception_check(error);
return Qnil;
}
|