From 3b834839d2328dc8d1f069cddee32f80a236c349 Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Mon, 28 Jul 2025 02:49:51 -0400
Subject: etc: oemu: Add XOR example to test-00.s

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

(limited to 'etc/oemu/test-00.s')

diff --git a/etc/oemu/test-00.s b/etc/oemu/test-00.s
index c0dbeee..423bb0e 100644
--- a/etc/oemu/test-00.s
+++ b/etc/oemu/test-00.s
@@ -20,5 +20,10 @@ some_label:      ! X
 =======
     and x1, #3   ! ~ 0x00000024
     or x2, #7    ! ~ 0x00000028
+<<<<<<< HEAD
     hlt          ! ~ 0x0000002C
 >>>>>>> 521cc2b (etc: oemu: Add example for 'OR' in test-00.s)
+=======
+    xor x2, #3   ! ~ 0x0000002C
+    hlt          ! ~ 0x00000030
+>>>>>>> 5d27983 (etc: oemu: Add XOR example to test-00.s)
-- 
cgit v1.2.3