Searched defs:merging (Results 1 – 2 of 2) sorted by relevance
1286 checkout_file (finfo, vers_ts, adding, merging, update_server) in checkout_file() argument
1335 int merging = 0; in __bb_exit_func() local