Mark as merged

rename FILE FILE.TMP
svn update FILE
rename FILE.TMP FILE
Type Value Description
FILE File to be marked as merged.  
FILE.TMP   Temporary filename.