source: LMDZ6/branches/Amaury_dev/tools/fcm/test/test_config/fcm1_branches_merge_conflict_fail @ 5095

Last change on this file since 5095 was 5095, checked in by abarral, 2 months ago

Revert cosp*/ from the trunk, as it's external code
Add missing bits from FCM2 source
  • Property svn:executable set to *
File size: 15 bytes
Line 
1extract_1=fail
Note: See TracBrowser for help on using the repository browser.