HomeSort by: relevance | last modified time | path
    Searched defs:merge_file (Results 1 - 1 of 1) sorted by relevancy

  /src/external/gpl2/xcvs/dist/src/
update.c 66 static int merge_file (struct file_info *finfo, Vers_TS *vers);
703 retval = merge_file (finfo, vers);
1939 merge_file (struct file_info *finfo, Vers_TS *vers) function
2560 /* See comment in merge_file about the "nonmergeable file"

Completed in 23 milliseconds