- do not try to merge generated _service: files on pull
authorAdrian Schröter <adrian@suse.de>
Thu, 17 Mar 2011 14:35:22 +0000 (15:35 +0100)
committerAdrian Schröter <adrian@suse.de>
Thu, 17 Mar 2011 14:35:22 +0000 (15:35 +0100)
commit4f8bedf9987623de323199039aee5a900093e353
treeed1f5ef4a510d38dc55610aac846f9278a729745
parentc859fc5430cdabc63cb52a134435431e62ea973d
- do not try to merge generated _service: files on pull
osc/commandline.py