-
Guillaume Melquiond authored
These attributes have no effect by themselves. You have to type the following command first: git config --global merge.ours.driver true
63c3a344
These attributes have no effect by themselves. You have to type the following command first: git config --global merge.ours.driver true