Use different git diff command.
1 unresolved thread
1 unresolved thread
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 2
− 3
@@ -46,7 +46,7 @@ variables:
@@ -413,5 +413,4 @@ default: