docs: update default conflict mode

copier-org · Jun 16, 2023 · 56f3652 · 56f3652
1 parent 1b351bc
commit 56f3652
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/copier/main.py b/copier/main.py
@@ -167,7 +167,7 @@ class Worker:
             See [quiet][].
 
         conflict:
-            One of "rej" (default), "inline" (still experimental).
+            One of "inline" (default), "rej".
 
         context_lines:
             Lines of context to consider when solving conflicts in updates.
@@ -881,7 +881,6 @@ def _apply_update(self):
                 ):
                     apply_cmd = apply_cmd["--exclude", skip_pattern]
                 (apply_cmd << diff)(retcode=None)
-                # TODO Test more, remove from experimental, make default
                 if self.conflict == "inline":
                     status = git("status", "--porcelain").strip().splitlines()
                     for line in status: