You are viewing a plain text version of this content. The canonical link for it is here.

Posted to users@subversion.apache.org by Ulrich Eckhardt <ec...@satorlaser.com> on 2005/07/17 10:09:45 UTC

merge uncomitted changes

Greetings!

I have two files that are mostly common. I just edited one of them and want to 
merge the changes into the other. Is there a syntax of 'svn merge' that 
allows me to do that? 
Note: I'm aware that I can 'svn diff|patch ...' the whole thing, I'm mostly 
wondering whether there was a way in Subversion.

Uli

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org