Searched refs:ours (Results 1 – 3 of 3) sorted by relevance
25 char *ours; member72 const char *ancestor, const char *ours, const char *theirs);
500 const git_merge_file_input *ours,522 const git_index_entry *ours,
65 Also, for each author's protection and ours, we want to make certain
