Searched refs:SERVER_MERGED (Results 1 - 4 of 4) sorted by relevance
| /openbsd-current/gnu/usr.bin/cvs/src/ |
| H A D | server.h | 76 SERVER_MERGED, no, SERVER_PATCHED, yes, but file is a diff from
87 SERVER_MERGED,
86 SERVER_MERGED, enumerator in enum:server_updated_arg4
|
| H A D | classify.c | 404 SERVER_UPDATED : SERVER_MERGED);
|
| H A D | update.c | 1530 merging ? SERVER_MERGED : SERVER_UPDATED,
2089 server_updated (finfo, vers, SERVER_MERGED,
2630 server_updated (finfo, vers, SERVER_MERGED,
|
| H A D | server.c | 4212 else if (updated == SERVER_MERGED)
4325 * which is now the case. If this is SERVER_MERGED, the file is
|
Completed in 184 milliseconds