diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:56:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-24 20:56:51 +0000 |
| commit | d64853ea10f497f46df9a70689a12b7455cb18ee (patch) | |
| tree | eab959364803cce0de3ebbc45a6877ff6eca6096 /src/tbz2tool.c | |
| parent | 2737e9a8b5ee396f4a8dbe35a52c80764ff384d8 (diff) | |
| download | portage-d64853ea10f497f46df9a70689a12b7455cb18ee.tar.gz portage-d64853ea10f497f46df9a70689a12b7455cb18ee.tar.bz2 portage-d64853ea10f497f46df9a70689a12b7455cb18ee.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). (trunk r6615)
svn path=/main/branches/2.1.2/; revision=6616
Diffstat (limited to 'src/tbz2tool.c')
0 files changed, 0 insertions, 0 deletions