test

test repo for stagit
git clone https://tilde.team/~karx/test.git
Log | Files | Refs
commit 778a2643183d2f7589680cb8d3b06a6b22297a61
parent 6732a1100685c30f54f88fb9fadebb66ae08cd3d
Author: ~karx <karx@tilde.team>
Date:   Mon,  8 Mar 2021 09:46:52 -0600

Fix merge conflicts

Diffstat:

Mtest.txt | 1+


1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/test.txt b/test.txt
@@ -4,3 +4,4 @@ hello there how are you today
 xfnw was here!
 julian was here!
 What is your favourite color?
+Test from julian