aboutsummaryrefslogtreecommitdiff
path: root/manifest
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2020-06-19 12:36:35 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2020-06-19 12:36:52 +0300
commit868b8b6de1440fba557fcce2f2a010a6360a8d01 (patch)
treea022f5f2c2aef8bcd23cb388b90dae10bd87b339 /manifest
parentc153df0ee5547deca163e19cd902b1c5675d61fe (diff)
Fix git 2.27 warning when running tests
Starting version 2.27 git requires the divergent branch reconciliation method to be specified explicitly for the pull command.
Diffstat (limited to 'manifest')
0 files changed, 0 insertions, 0 deletions