On 2007-11-17 20:06, Howard Goldstein [EMAIL PROTECTED] wrote:
Giorgos Keramidas wrote:
On 2007-11-16 22:34, J. Porter Clark [EMAIL PROTECTED] wrote:
mergemaster for more details, but here's a short description of what I
use on my laptop for some time now:
1. A `.mergemasterrc' file in
Giorgos Keramidas wrote:
On 2007-11-17 20:06, Howard Goldstein [EMAIL PROTECTED] wrote:
Giorgos Keramidas wrote:
On 2007-11-16 22:34, J. Porter Clark [EMAIL PROTECTED] wrote:
mergemaster for more details, but here's a short description of what I
use on my laptop for some time now:
1. A
On Fri, Nov 16, 2007 at 10:34:26PM -0600, J. Porter Clark wrote:
Is there any way to keep certain files out of the reach of
mergemaster? I understand the need for carefully merging the
old and the new, but I really shouldn't ever have to for files
like these:
/etc/aliases
/etc/hosts
On 2007-11-16 22:34, J. Porter Clark [EMAIL PROTECTED] wrote:
Is there any way to keep certain files out of the reach of
mergemaster? I understand the need for carefully merging the
old and the new, but I really shouldn't ever have to for files
like these:
/etc/aliases
/etc/hosts
Giorgos Keramidas wrote:
On 2007-11-16 22:34, J. Porter Clark [EMAIL PROTECTED] wrote:
mergemaster for more details, but here's a short description of what I
use on my laptop for some time now:
Please consider submitting this as a PR in hopes it gets included in the
actual package.
1. A
Is there any way to keep certain files out of the reach of
mergemaster? I understand the need for carefully merging the
old and the new, but I really shouldn't ever have to for files
like these:
/etc/aliases
/etc/hosts
/etc/hosts.allow
/etc/manpath.config
... and many others.