##// END OF EJS Templates
merge-checks: added more detailed information about why merge is not possible....
merge-checks: added more detailed information about why merge is not possible. - information is stored inside .error_details now.

File last commit:

r1030:158ce501 default
r1341:611f8936 default
Show More
diff_match_patch_license.txt
14 lines | 600 B | text/plain | TextLexer
/ licenses / diff_match_patch_license.txt
Copyright 2006 Google Inc.
http://code.google.com/p/google-diff-match-patch/
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.