client: Disable conflict copies by default.

This commit is contained in:
Andreas Schneider 2012-02-22 17:52:19 +01:00
parent f753a3db0a
commit 2b05dc33b7

View file

@ -187,6 +187,7 @@ int main(int argc, char **argv) {
arguments.update = 1;
arguments.reconcile = 1;
arguments.propagate = 1;
arguments.with_conflict_copys = false;
/*
* Parse our arguments; every option seen by parse_opt will