unofficial mirror of help-gnu-emacs@gnu.org
 help / color / mirror / Atom feed
* Ediff and merge
@ 2009-05-15 19:34 Rasmus Pank Roulund
  0 siblings, 0 replies; 4+ messages in thread
From: Rasmus Pank Roulund @ 2009-05-15 19:34 UTC (permalink / raw)
  To: help-gnu-emacs

Hello,
I have a simple and probably simple question on ediff and merge.
I use SVN. Sometimes conflicts happens. I try to resolve them with
Ediff. I use the 3files mode and use "a" and "b" to select whatever I
want to keep.
However, what to I type to save buffer c and resolve the conflict? It
would be the next logic step but I just cannot find the correct key...
At the moment I do "wc" and save it in place of the conflicted file and
resolve the conflict manually in svn-staus (I use psvn).
I hope somebody can help me out. 
I have read the quick help and a more extended version.

Thanks,
Rasmus 





^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-05-17  4:30 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <mailman.7223.1242416089.31690.help-gnu-emacs@gnu.org>
2009-05-16  4:30 ` Ediff and merge Giorgos Keramidas
2009-05-16 10:28   ` Rasmus Pank Roulund
     [not found]   ` <mailman.7259.1242469777.31690.help-gnu-emacs@gnu.org>
2009-05-17  4:30     ` Giorgos Keramidas
2009-05-15 19:34 Rasmus Pank Roulund

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).