Changes destined for a directory arrived via the following revisions during merge of
'^/branches/bug_2590/de.am_soft.sm_mtg.model/src/de:178475-179385':
 r179367 by tschoening@am-soft.de
No such file or directory was found in the merge target working copy.
The directory was moved to '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.oms/src/main/java/de' in r178707 by tschoening@am-soft.de.
Ambiguous move destinations exist in the repository; try the 'd' option
Select: (p) Postpone, (r) Mark as resolved,
        (m) Apply to move destination,
        (d) Set repository move destination path, (h) Help,
        (q) Quit resolution: d
Possible repository destinations for moved-away 'branches\bug_2590_gradle\de.am_soft.sm_mtg.model\src\de' are:
 (1): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.api/src/main/java/de'
 (2): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model/src/main/java/de'
 (3): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.cmd/src/main/java/de'
 (4): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.oms/src/main/java/de'
 (5): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.model.ws/src/main/java/de'
 (6): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser/src/main/java/de'
 (7): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.cmd/src/main/java/de'
 (8): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.oms.post_proc/src/main/java/de'
 (9): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.oms.search/src/main/java/de'
 (10): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.packet/src/main/java/de'
 (11): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.parser.packet.factory/src/main/java/de'
 (12): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.serializer/src/main/java/de'
 (13): '^/branches/bug_2590_gradle/de.am_soft.sm_mtg.serializer.record/src/main/java/de'
Only one destination can be a move; the others are copies.
Specify the correct move target path by number: 2
Select: (p) Postpone, (r) Mark as resolved,
        (m) Apply to move destination,
        (d) Set repository move destination path, (h) Help,
        (q) Quit resolution: m
Tree conflict at 'de.am_soft.sm_mtg.model\src\de' marked as resolved.
Summary of conflicts:
  Tree conflicts: 0 remaining (and 3 already resolved)