From 810a29e9f56f8d3cf2cb1b66118b84d092be06b8 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Sat, 12 Jan 2019 10:09:39 +0100
Subject: Revise instructions about how to exclude l10n files from Git merge

---
 .gitattributes | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 75da1b1fa1..db2d848cb1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,10 +1,12 @@
-# TODO
 # Execute the following command in your local project
-# directory to enable automatic merge resolution:
+# directory to exclude localization files from merges
+# across branches:
 #
 # $ git config --global merge.ours.driver true
 #
-# Otherwise the settings in this file are ignored!
+# This command sets a shell script that is used for all
+# merge=ours files. In this case the script "true" does
+# not touch anything, just returns successful.
 #
 # Background: Localization files from external sources like
 # Transifex must not be merged between release branches and
-- 
cgit v1.2.3