Revert "Allow branch.*.merge to talk about remote tracking branches."

diff --git a/contrib/gitview/gitview b/contrib/gitview/gitview
index 3b6bdceeeb20daf3242cf98d12f8f4d94cffc6e8..521b2fcd32da4103d0c916af0ae44fbe53ed282a 100755 (executable)
--- a/contrib/gitview/gitview
+++ b/contrib/gitview/gitview
@@ -497,7 +497,7 @@ class GitView:
                fp.close()
 
        def get_encoding(self):
-               fp = os.popen("git repo-config --get i18n.commitencoding")
+               fp = os.popen("git config --get i18n.commitencoding")
                self.encoding=string.strip(fp.readline())
                fp.close()
                if (self.encoding == ""):