resolve merge conflict

test.ruby

@@ -13,7 +13,7 @@ def flag_exec(flag)
     when "--version"
         puts "Havas version 0.0.1"
     when "-"
-        
+        repl
     when "--help"
         puts help
     else
@@ -27,3 +27,10 @@ end
 if cli_ARGS.length == 0 then flag_exec 0 end
 cli_ARGS.each{|flag| if flag[0]=='-' then flag_exec flag end}
 
+
+def repl()
+    while true do
+        puts ">>>>>>"
+        eval("puts 'hie'")
+    end
+end