Home
last modified time | relevance | path

Searched refs:found_text_conflict (Results 1 – 2 of 2) sorted by relevance

/NextBSD/contrib/subversion/subversion/libsvn_wc/
HDexternals.c856 svn_boolean_t found_text_conflict; in close_file() local
861 &found_text_conflict, in close_file()
880 if (found_text_conflict) in close_file()
HDupdate_editor.c3966 svn_boolean_t found_text_conflict = FALSE; in merge_file() local
4056 &found_text_conflict, in merge_file()
4139 if (found_text_conflict) in merge_file()