Showing paste #yLOj by stsp@apache.org:

Tree conflict on 'Header':
File merged from
'^/vendor/file/dist/Header@264'
to
'^/vendor/file/dist/Header@265'
was moved to '^/vendor/file/dist/doc/file.man' by delphij in r265.
A file which differs from the corresponding file on the merge source branch was found in the working copy.
Ambiguous move destinations exist in the repository; try the 'd' option
Select: (p) Postpone, (r) Mark as resolved, (m) Move and merge,
        (d) Set repository move destination path, (h) Help,
        (q) Quit resolution: d
Possible repository destinations for moved-away 'Header' are:
 (1): '^/vendor/file/dist/doc/file.man'
 (2): '^/vendor/file/dist/doc/libmagic.man'
 (3): '^/vendor/file/dist/doc/magic.man'
 (4): '^/vendor/file/dist/magic/Header'
 (5): '^/vendor/file/dist/magic/Localstuff'
 (6): '^/vendor/file/dist/src/Makefile.am'
 (7): '^/vendor/file/dist/src/apprentice.c'
 (8): '^/vendor/file/dist/src/apptype.c'
 (9): '^/vendor/file/dist/src/ascmagic.c'
 (10): '^/vendor/file/dist/src/asprintf.c'
 (11): '^/vendor/file/dist/src/cdf.c'
 (12): '^/vendor/file/dist/src/cdf.h'
 (13): '^/vendor/file/dist/src/cdf_time.c'
 (14): '^/vendor/file/dist/src/compress.c'
 (15): '^/vendor/file/dist/src/elfclass.h'
 (16): '^/vendor/file/dist/src/encoding.c'
 (17): '^/vendor/file/dist/src/file.c'
 (18): '^/vendor/file/dist/src/file.h'
 (19): '^/vendor/file/dist/src/file_opts.h'
 (20): '^/vendor/file/dist/src/fsmagic.c'
 (21): '^/vendor/file/dist/src/funcs.c'
 (22): '^/vendor/file/dist/src/getline.c'
 (23): '^/vendor/file/dist/src/getopt_long.c'
 (24): '^/vendor/file/dist/src/is_tar.c'
 (25): '^/vendor/file/dist/src/magic.c'
 (26): '^/vendor/file/dist/src/magic.h'
 (27): '^/vendor/file/dist/src/mygetopt.h'
 (28): '^/vendor/file/dist/src/print.c'
 (29): '^/vendor/file/dist/src/readcdf.c'
 (30): '^/vendor/file/dist/src/readelf.c'
 (31): '^/vendor/file/dist/src/readelf.h'
 (32): '^/vendor/file/dist/src/softmagic.c'
 (33): '^/vendor/file/dist/src/strlcat.c'
 (34): '^/vendor/file/dist/src/strlcpy.c'
 (35): '^/vendor/file/dist/src/tar.h'
 (36): '^/vendor/file/dist/src/vasprintf.c'
Only one destination can be a move; the others are copies.
Specify the correct move target path by number: 
Make a new paste