diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:28:07 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 20:28:07 +0000 |
| commit | df085424c9885bce596c587ddd38bc419cc8ae0e (patch) | |
| tree | 3f2551a89af10ed1cf8a3314fa3dde70f99efb75 /bin | |
| parent | f42e1f9eeb04134fdb432be873c57b08722297c8 (diff) | |
| download | portage-df085424c9885bce596c587ddd38bc419cc8ae0e.tar.gz portage-df085424c9885bce596c587ddd38bc419cc8ae0e.tar.bz2 portage-df085424c9885bce596c587ddd38bc419cc8ae0e.zip | |
Remove unused merge_cmd variable. (trunk r15371)
svn path=/main/branches/2.1.7/; revision=15598
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/dispatch-conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bin/dispatch-conf b/bin/dispatch-conf index f504a7a0d..4ceb1a0fa 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -117,7 +117,6 @@ class dispatch: "use-rcs=yes in config; fatal', file=sys.stderr) return False - merge_cmd = self.options.get("merge", "").split() # config file freezing support frozen_files = set(self.options.get("frozen-files", "").split()) |