[Gnu-arch-users] Re: NEW: three-way merges / conflict markers

[Miles Bader]

BTW, `-3' seems like a nicer short-option for `--three-way' than `-t'
(and perhaps less likely to cause name clashses, as it's more likely
some future option will start with "t" than with "three").

-Miles
-- 
Love is a snowmobile racing across the tundra.  Suddenly it flips over,
pinning you underneath.  At night the ice weasels come.  --Nietzsche