Explore Help
Sign In
openpkg
/
openpkg-packages
1
0
Fork
You've already forked openpkg-packages
0
Code Issues Pull Requests Projects Releases Wiki Activity
46901 Commits
1 Branch
2 Tags
595 MiB
Tree: 66b1265391
master
CVS-to-MTN
MTN-to-GIT
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '66b1265391'
${ noResults }
Commit Graph

6 Commits (66b12653917c844b9d681f1d37826aa9b4741121)

Author SHA1 Message Date
Dr. Ralf S. Engelschall 7b94c069de regen patch
14 years ago
Dr. Ralf S. Engelschall 3b3dcf97c8 upgrading package: diffutils 2.8.7 -> 2.9
16 years ago
Dr. Ralf S. Engelschall 0dfdbe169a do not confuse people with this additional option which is provided by OpenPKG only
18 years ago
Dr. Ralf S. Engelschall dce4d4b6ad document -O option, too
19 years ago
Dr. Ralf S. Engelschall e0f6ee67c4 Add option "-O" to diff3(1) in order to allow one to display information about the 2nd file (the ancestor/older one) not just under option "-A", but also under "-E" and "-X". This way one especially can get the consise output of "-E" (where only "unmerged" conflicts and overlaps are shown), but still get the verbose information (introduced with "||||||| <older-name>") about the ancestor/older file in the flagged/marked output. This way "diff3 -m -E -O" gives one the best resolution chances on a 3-way merge without having to deal with the useless (already "merged") information one would get under "diff3 -m -A".
19 years ago
Dr. Ralf S. Engelschall f46db19007 port to FreeBSD 5.0
23 years ago
Powered by Gitea Version: 1.16.6 Page: 7936ms Template: 2ms
GitHub
English
bahasa Indonesia Deutsch English español français italiano latviešu magyar nyelv Nederlands polski Português de Portugal português do Brasil suomi svenska Türkçe čeština ελληνικά български русский српски Українська فارسی മലയാളം 日本語 简体中文 繁體中文(台灣) 繁體中文(香港) 한국어
Licenses API Website Go1.18.1