Skip to content

Commit a43c42b

Browse files
committed
Only show conflicts with 'clean' command
1 parent a8187e9 commit a43c42b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

mine/services.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ def delete_conflicts(root=None, config_only=False, force=False) -> int:
7474
path = os.path.join(dirname, filename)
7575
if force:
7676
os.remove(path)
77-
print(path)
77+
if not config_only:
78+
print(path)
7879

7980
if count and not force:
8081
print(f"\nRun again with '--force' to delete these {count} conflict(s)")

0 commit comments

Comments
 (0)