| commit | 9fccad2e46d09052f4433e6764448c3518ae37f0 | [log] [tgz] |
|---|---|---|
| author | Matthias Sohn <matthias.sohn@sap.com> | Wed Jun 01 18:14:28 2022 +0200 |
| committer | Matthias Sohn <matthias.sohn@sap.com> | Wed Jun 01 18:14:28 2022 +0200 |
| tree | 6bb2c4188f1fac42120407a425774ad713e42780 | |
| parent | 4bb024192d838938d1673bfb9652dea237f1317f [diff] | |
| parent | bb30be6b3335c67ee59d3705d5e04e2dbb688128 [diff] |
Merge branch 'master' into stable-6.2 * master: Fixed since tags added for new merge constants Add filtering with help of DirCacheCheckout.getContent() Avoid warning "no explicit project encoding" Add mergetool merge feature (execute external tool) Add command line support for "git mergetool" Add config reader for user-defined mergetools Add difftool compare feature (execute external tool) Change-Id: Ie215b8205b85cfd9efddb622c90dfad7a5ae0caa