2 Commits

Author	SHA1	Message	Date
Matt Mackall	b24119a251	Fix test permission	2006-11-30 18:22:44 -06:00
Matt Mackall	05748f203d	merge: handle directory renames ... commit: handle new copy dirstate case correctly findcopies: keep a map of all copies found for directory logic add dirs filter check for merge:followdirs config option generate a directory move map find files that match directory move map manifestmerge: add directory rename cases applyupdates: skip actions with None file add "d" action recordupdates: add "d" action add simple directory rename test	2006-11-30 17:36:33 -06:00