l10n: es.po v2.20.0 round 3

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index eb36837f86e21423e0a543eceb67313eed27d310..4cc86469f3dd45564b40b327d1b39f2bb213bb98 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -342,7 +342,7 @@ include::merge-strategies.txt[]
 
 CONFIGURATION
 -------------
-include::merge-config.txt[]
+include::config/merge.txt[]
 
 branch.<name>.mergeOptions::
        Sets default options for merging into branch <name>. The syntax and