From 7859e0ff5fbc94ec0b36168ac81e94482274b5c6 Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Sun, 27 Jul 2025 23:22:32 -0400
Subject: etc: oemu: Add example for 'OR' in test-00.s

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 etc/oemu/test-00.s | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'etc')

diff --git a/etc/oemu/test-00.s b/etc/oemu/test-00.s
index 4b5db7c..c0dbeee 100644
--- a/etc/oemu/test-00.s
+++ b/etc/oemu/test-00.s
@@ -12,7 +12,13 @@ some_label:      ! X
     inc x1       ! ~ 0x00000018
     add x2, #3   ! ~ 0x0000001C
     mrow x4, #0  ! ~ 0x00000020
+<<<<<<< HEAD
     nop          ! ~ 0x00000024
     or x1, #3    ! ~ 0x00000028
     xor x2, #3   ! ~ 0x0000002C
     hlt          ! ~ 0x00000030
+=======
+    and x1, #3   ! ~ 0x00000024
+    or x2, #7    ! ~ 0x00000028
+    hlt          ! ~ 0x0000002C
+>>>>>>> 521cc2b (etc: oemu: Add example for 'OR' in test-00.s)
-- 
cgit v1.2.3