Searched refs:importmergecmd (Results 1 – 4 of 4) sorted by relevance
1242 } importmergecmd; variable2912 importmergecmd.seen = 1; in handle_mt()2924 if (importmergecmd.conflicts == 0 in handle_mt()2925 || !importmergecmd.mergetag1 in handle_mt()2926 || !importmergecmd.mergetag2 in handle_mt()2927 || !importmergecmd.repository) in handle_mt()2934 if (importmergecmd.conflicts == -1) in handle_mt()2938 importmergecmd.conflicts); in handle_mt()2950 cvs_output (importmergecmd.mergetag1, 0); in handle_mt()2952 cvs_output (importmergecmd.mergetag2, 0); in handle_mt()[all …]
3808 * client.c (handle_mt): Handle an importmergecmd tag without12500 * client.c (importmergecmd): New static struct.12501 (handle_mt): Handle +importmergecmd tag.
1899 The @code{importmergecmd} tag is used when doing an import which has1911 MT +importmergecmd1916 MT -importmergecmd
499 * cvsclient.texi (MT importmergecmd tag): Document that this2458 * cvsclient.texi (Text tags): Document importmergecmd tag.