d_merge.in revision 276478
1# The last entry for any duplicate node should take precedence. 2 3. type=dir 4 5# directory "a" with only one entry, changing from dir to link 6./a type=dir 7./a/change-dir-to-link type=dir mode=0755 8./a/change-dir-to-link type=link mode=0755 9 10# directory "b" with only one entry, changing from link to dir 11./b type=dir 12./b/change-link-to-dir type=link mode=0755 13./b/change-link-to-dir type=dir mode=0755 14 15# directory "c" with multiple entries, one changing from dir to link 16./c type=dir 17./c/aaa type=file 18./c/zzz type=file 19./c/change-dir-to-link type=dir mode=0755 20./c/change-dir-to-link type=link mode=0755 21 22# directory "d" with multiple entries, one changing from link to dir 23./d type=dir 24./d/aaa type=file 25./d/zzz type=file 26./d/change-link-to-dir type=link mode=0755 27./d/change-link-to-dir type=dir mode=0755 28