##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.
dan - - Load All Authors

File last commit:

r1030:158ce501 default
r2784:e8c62649 default
Show More
diff_match_patch_license.txt
14 lines | 600 B | text/plain | TextLexer
/ licenses / diff_match_patch_license.txt
History | Annotation | Raw |Copy content |Copy permalink
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.