“Showing N conflicts for A into B” -> “Showing N conflicts between A and B”

c19ad19e · Douwe Maan · Fatih Acet · 254dbad8 · c19ad19e
Commit c19ad19e authored Aug 10, 2016 by Douwe Maan Committed by Fatih Acet Aug 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/views/projects/merge_requests/conflicts/_commit_stats.html.haml ...projects/merge_requests/conflicts/_commit_stats.html.haml +2 -2

No files found.
--- a/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_commit_stats.html.haml
@@ -14,7 +14,7 @@
    .commit-stat-summary
      Showing
      %strong.cred {{conflictsCount}} conflicts
-      for
+      between
      %strong {{conflictsData.source_branch}}
-      into
+      and
      %strong {{conflictsData.target_branch}}