source:
XMLIO_V2/tools/FCM/test/repos/trunk/cfg/fcm1_branches_merge_conflict_fail.cfg
@
81
Last change on this file since 81 was 81, checked in by ymipsl, 14 years ago | |
---|---|
File size: 458 bytes |
Rev | Line | |
---|---|---|
[81] | 1 | CFG::TYPE ext |
2 | CFG::VERSION 1.0 | |
3 | ||
4 | INC $HERE/fcm1_base.cfg | |
5 | ||
6 | REPOS::test::branch1 fcm:test_suite_br/dev/Share/modify_files_base | |
7 | REPOS::test::branch2 fcm:test_suite_br/dev/Share/modify_files_merge1 | |
8 | REPOS::test::branch3 fcm:test_suite_br/dev/Share/modify_files_merge2 | |
9 | ||
10 | CONFLICT fail |
Note: See TracBrowser
for help on using the repository browser.