On Sat, 21 Jul 2018 12:02:19 -0700 Cy Schubert wrote: >> I wish mergemaster had an option to just add new users and groups, >> rather than merging the files. > What's the difference? It would be automatic, so less hassle and no chance of getting the merge wrong.