Searched defs:conflict (Results 1 - 4 of 4) sorted by relevance

/haiku-fatelf/src/bin/rcs/
H A Dpartime.c645 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
663 # undef conflict macro
[all...]
/haiku-fatelf/src/bin/patch/
H A Dpartime.c888 # define conflict(a,b) ((a) != (b) && TM_DEFINED (a) && TM_DEFINED (b)) macro
903 # undef conflict macro
[all...]
/haiku-fatelf/src/libs/ncurses/progs/
H A Dtic.c1339 bool conflict = FALSE; local
/haiku-fatelf/src/bin/diffutils/src/
H A Ddiff3.c1494 bool conflicts_found = 0, conflict; local
1611 bool conflicts_found = 0, conflict; local
[all...]

Completed in 104 milliseconds