[annex] Change conflict autoresolve error message

It seems that it's no longer possible to get the names of files that
were automatically resolved. Changing the error message to simply advise
the user to examine the results after the merge.

Author: achilleas-k

git/annex.go

@@ -1100,7 +1100,7 @@ func checkMergeErrors(stdout, stderr string) error {
 		// abort merge
 	} else if strings.Contains(messages, "merge conflict was automatically resolved") {
 		// Merge conflict in annex files (automatically resolved by keeping both copies)
-		return fmt.Errorf("files changed locally and remotely. Both files have been kept:\n %s", strings.Join(parseFilesAnnexConflict(stdout), ", "))
+		return fmt.Errorf("files changed locally and remotely and the conflict was automatically resolved; you may want to examine the result")
 		// TODO: This should probably instead become a warning or notice, instead of a full error
 	}
 	return nil