jengelh/schily
SHA256
1
0
Fork 0
forked from pool/schily
Code Pull Requests Activity

- Add Conflict markers for file-based conflicts identified

Browse Source 
by repo-checker.

OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=56
This commit is contained in:
Jan Engelhardt 2019-03-16 08:50:32 +00:00 committed by Git OBS Bridge
parent 7c67418500
commit 6ebe8dc730
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
schily.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 16 08:49:52 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Add Conflict markers for file-based conflicts identified
by repo-checker.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 15 10:09:54 UTC 2019 - Jan Engelhardt <jengelh@inai.de> Fri Mar 15 10:09:54 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

3
schily.spec
View File

@ -59,6 +59,7 @@ The "Schily" Tool Box is a set of tools written or managed by Jörg Schilling.
Summary: Multibyte-capable POSIX-conforming Bourne shell Summary: Multibyte-capable POSIX-conforming Bourne shell
License: CDDL-1.0 License: CDDL-1.0
Group: System/Shells Group: System/Shells
Conflicts: bsh
%description -n bosh %description -n bosh
bosh is a Bourne-style POSIX command interpreter (shell), similar to dash, bosh is a Bourne-style POSIX command interpreter (shell), similar to dash,
@ -375,6 +376,8 @@ connection, and through that, have the rmt program executed.
Summary: Source Code Control System Summary: Source Code Control System
License: CDDL-1.0 License: CDDL-1.0
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Conflicts: delta
Conflicts: ksh
%description -n sccs %description -n sccs
Source Code Control System (SCCS) is a version control system for Source Code Control System (SCCS) is a version control system for