projects
/
platform
/
upstream
/
zypper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a5a95ad
)
changes
author
Michael Andres
<ma@suse.de>
Wed, 29 Jan 2014 11:41:45 +0000
(12:41 +0100)
committer
Michael Andres
<ma@suse.de>
Wed, 29 Jan 2014 11:41:45 +0000
(12:41 +0100)
package/zypper.changes
patch
|
blob
|
history
diff --git
a/package/zypper.changes
b/package/zypper.changes
index
057a6a0
..
735ea43
100644
(file)
--- a/
package/zypper.changes
+++ b/
package/zypper.changes
@@
-3,6
+3,7
@@
Wed Jan 29 10:57:54 CET 2014 - ma@suse.de
- Don't treat missing packages due to download mode as error in
fileconflict check.
+- Add --replacefiles option to resolve file conflicts (bnc#673720)
- version 1.10.4
-------------------------------------------------------------------