[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Trying to merge two files with emacs... need help!
From: |
Eli Zaretskii |
Subject: |
Re: Trying to merge two files with emacs... need help! |
Date: |
Wed, 12 May 2004 22:42:42 +0200 |
> From: gzimak@yahoo.com (Gary Z)
> Newsgroups: gnu.emacs.help
> Date: 12 May 2004 04:50:45 -0700
>
> It actually was a typo, but not the one you suggested. I'm chosing
> "Compare Two files" from the menu. I was trying not to use Merge,
> since I wanted more control over how conflicts are handled. Am I going
> about it the wrong way?
I think you need to select "Merge" and then "Files". You will have
full control on how conflicts are handled.