projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86547cc
)
de-typo
author
Fabian Groffen
<grobian@gentoo.org>
Wed, 30 Jan 2008 19:45:49 +0000
(19:45 -0000)
committer
Fabian Groffen
<grobian@gentoo.org>
Wed, 30 Jan 2008 19:45:49 +0000
(19:45 -0000)
svn path=/main/branches/prefix/; revision=9232
bin/repoman
patch
|
blob
|
history
diff --git
a/bin/repoman
b/bin/repoman
index 20cbb7739c93f19419d5b1c674b2ce62131084ae..fc987d43ce950917666377996a02f573d3dbb9f4 100755
(executable)
--- a/
bin/repoman
+++ b/
bin/repoman
@@
-656,7
+656,7
@@
else:
xmllint_capable=True
if options.mode == 'commit' and isVcs:
- utilties.detect_vcs_conflicts(options, vcs=vcs)
+ util
i
ties.detect_vcs_conflicts(options, vcs=vcs)
if options.mode == "manifest":
pass