From 6ebe8dc7302c7894186434046419817c25560e140b5ead56f02afbce0260c8fc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 16 Mar 2019 08:50:32 +0000 Subject: [PATCH] - Add Conflict markers for file-based conflicts identified by repo-checker. OBS-URL: https://build.opensuse.org/package/show/utilities/schily?expand=0&rev=56 --- schily.changes | 6 ++++++ schily.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/schily.changes b/schily.changes index e901120..5012575 100644 --- a/schily.changes +++ b/schily.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 16 08:49:52 UTC 2019 - Jan Engelhardt + +- Add Conflict markers for file-based conflicts identified + by repo-checker. + ------------------------------------------------------------------- Fri Mar 15 10:09:54 UTC 2019 - Jan Engelhardt diff --git a/schily.spec b/schily.spec index 938cd40..0da241a 100644 --- a/schily.spec +++ b/schily.spec @@ -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 License: CDDL-1.0 Group: System/Shells +Conflicts: bsh %description -n bosh 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 License: CDDL-1.0 Group: Development/Tools/Version Control +Conflicts: delta +Conflicts: ksh %description -n sccs Source Code Control System (SCCS) is a version control system for