projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bf8e88f) | patch
Fix the ignore-previously-merged option so that it compares the original files, since...
authorZac Medico <zmedico@gentoo.org>
Thu, 24 May 2007 20:55:37 +0000 (20:55 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 24 May 2007 20:55:37 +0000 (20:55 -0000)
commit8d650ba2b38ca5b2eb4401dc1d26ba43e37488ec
tree2f9123b2386d99200059c26d0c7b6d4481aed389tree | snapshot
parentbf8e88f8e7ec66a476eb0e2bf9eeca763a7546e1commit | diff
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
bin/dispatch-conf diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.