projects / portage.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2737e9a) | 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:56:51 +0000 (20:56 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 24 May 2007 20:56:51 +0000 (20:56 -0000)
commitd64853ea10f497f46df9a70689a12b7455cb18ee
treeeab959364803cce0de3ebbc45a6877ff6eca6096tree | snapshot
parent2737e9a8b5ee396f4a8dbe35a52c80764ff384d8commit | 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). (trunk r6615)

svn path=/main/branches/2.1.2/; revision=6616
bin/dispatch-conf diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.