Remi Lespinet <remi.lespi...@ensimag.grenoble-inp.fr> writes: > @@ -90,10 +90,13 @@ default. You can use `--no-utf8` to override this. > > -3:: > --3way:: > +--no-3way:: > When the patch does not apply cleanly, fall back on > 3-way merge if the patch records the identity of blobs > it is supposed to apply to and we have those blobs > - available locally. > + available locally. `--no-3way` can be used to override > + am.threeWay configuration variable. For more information, > + see am.threeWay in git-config(1).
... in linkgit:git-config[1]. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
