Searched refs:SERVER_MERGED (Results 1 - 4 of 4) sorted by relevance

/freebsd-9.3-release/contrib/cvs/src/
H A Dserver.h98 SERVER_MERGED, no, SERVER_PATCHED, yes, but file is a diff from
109 SERVER_MERGED, enumerator in enum:server_updated_arg4
H A Dclassify.c469 SERVER_UPDATED : SERVER_MERGED);
H A Dupdate.c1479 merging ? SERVER_MERGED : SERVER_UPDATED,
1960 server_updated (finfo, vers, SERVER_MERGED, (mode_t) -1, NULL, NULL);
H A Dserver.c4305 else if (updated == SERVER_MERGED)
4417 * which is now the case. If this is SERVER_MERGED, the file is

Completed in 117 milliseconds