Searched defs:merging (Results 1 – 2 of 2) sorted by relevance
48 int nflag = 0, vflag = 0, fflag = 0, merging = 0; variable
1225 int merging, int update_server) in checkout_file()