how to set an ignore list for merge

From: fjin <fjin_at_wiscom.com.cn>
Date: 2007-01-18 09:37:47 CET

dev£¬

I want to use merge to update my branch code from trunk. But in my branch code, i want some files can be ignored when merge. But i can't find how to set in tortoisesvn, can you tell me?
fjin£¬fjin@wiscom.com.cn
2007-01-18
Received on Thu Jan 18 09:40:44 2007

This message: [ Message body ]
Next message: Stefan Küng: "Re: Please support diffs from svnlook"
Previous message: Lübbe Onken: "RE: Please support diffs from svnlook"
Next in thread: Stefan K¨¹ng: "Re: how to set an ignore list for merge"
Reply: Stefan K¨¹ng: "Re: how to set an ignore list for merge"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]