chiark / gitweb /
~ianmdlvl / otter.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b5afb1) | patch
script: Abolish conflict_expected
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 14 Jul 2021 15:34:49 +0000 (16:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 14 Jul 2021 15:34:49 +0000 (16:34 +0100)
commitfdb792bc4f5a3b13413ec40c847083c0043435fd
tree2b03fa1b12425cd7fedf82bfc97d6dea33ad3484tree | snapshot
parent0b5afb121f3c8702f6db13aa53c78011d9715883commit | diff
script: Abolish conflict_expected

This was always false.  It was a bad attempt at conflict/error
handling, which is now done according to a properly thought-out
scheme.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
templates/script.ts diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.