t / t5100 / msg0004on commit xdiff-merge: optionally show conflicts in "diff3 -m" style (e0af48e)
   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