t / t5100 / msg0004on commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Hello.
   2
   3Try all addresses for given remote name until it succeeds.
   4Also supports IPv6.
   5
   6Signed-of-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
   7