[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: NEW: three-way merges / conflict markers
From: |
Miles Bader |
Subject: |
[Gnu-arch-users] Re: NEW: three-way merges / conflict markers |
Date: |
24 Sep 2003 20:33:29 +0900 |
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
- Re: [Gnu-arch-users] NEW: three-way merges / conflict markers, (continued)
[Gnu-arch-users] Re: NEW: three-way merges / conflict markers,
Miles Bader <=