##// END OF EJS Templates
vcs: use a real two part name for merge operation....
vcs: use a real two part name for merge operation. - expose settings into vcs_settings for easier override later

File last commit:

r1:854a839a default
r3040:dcaa9d67 stable
Show More
msgpack_license.txt
13 lines | 613 B | text/plain | TextLexer
Copyright (C) 2008-2011 INADA Naoki <songofacandy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.