diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:55:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:55:37 +0000 |
| commit | 8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec (patch) | |
| tree | 2f9123b2386d99200059c26d0c7b6d4481aed389 /pym | |
| parent | bf8e88f8e7ec66a476eb0e2bf9eeca763a7546e1 (diff) | |
| download | portage-8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec.tar.gz portage-8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec.tar.bz2 portage-8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec.zip | |
Fix the ignore-previously-merged option so that it compares the original files, since mrgconf can be identical to conf['current'] even when conf['new'] is different from the archived .dist version (due to diff3 merging).
svn path=/main/trunk/; revision=6615
Diffstat (limited to 'pym')
0 files changed, 0 insertions, 0 deletions