|
| From: | Zenaan Harkness |
| Subject: | Re: [Gnu-arch-users] merge conflicts |
| Date: | Fri, 08 Oct 2004 13:38:54 +1000 |
> As a side note, I think I've heard that star-merge --three-way will also > create empty .rej files just to make it obvious what files conflicted. > Is this still true? yes
| [Prev in Thread] | Current Thread | [Next in Thread] |