[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: practical diff-mode.el question
|
From: |
Matthieu Moy |
|
Subject: |
[Gnu-arch-users] Re: practical diff-mode.el question |
|
Date: |
Thu, 12 May 2005 23:22:28 +0200 |
|
User-agent: |
Gnus/5.1002 (Gnus v5.10.2) Emacs/21.4 (gnu/linux) |
Robert Anderson <address@hidden> writes:
> diff-mode.el is a godsend, especially the hunk splitting capability.
> However, I am going blind trying to figure out why certain hunks don't
> apply.
Do you have a particular reason not to use a 3-way merge +
SMerge-mode (and smerge-ediff). I usually prefer it to .rej files.
--
Matthieu