Fix bugs as a result of merge

Signed-off-by: Jacob Stopak <jacob@initialcommit.io>

Author: initialcommit-io

git_sim/__main__.py

@@ -121,6 +121,7 @@ def main(
         "--quiet",
         "-q",
         help="Suppress all output except errors",
+    ),
     invert_branches: bool = typer.Option(
         settings.invert_branches,
         help="Invert positioning of branches by reversing order of multiple parents where applicable",

git_sim/git_sim_base_command.py

@@ -905,7 +905,7 @@ def get_nondark_commits(self):
         nondark_commits = []
         return nondark_commits
 
-    def draw_ref(self, commit, i, top, text="HEAD", color=m.BLUE):
+    def draw_ref(self, commit, top, i=0, text="HEAD", color=m.BLUE):
         refText = m.Text(text, font="Monospace", font_size=20, color=self.fontColor)
         refbox = m.Rectangle(
             color=color,

git_sim/log.py

@@ -34,7 +34,6 @@ def __init__(self, ctx: typer.Context, n: int, all: bool):
             pass
 
     def construct(self):
-<<<<<<< HEAD
         if not settings.stdout and not settings.output_only_path and not settings.quiet:
             print(
                 f"{settings.INFO_STRING} {type(self).__name__.lower()}{' --all' if self.all_subcommand else ''}{' -n ' + str(self.n) if self.n_subcommand else ''}"