diff options
| author | Paul Nasrat <pnasrat@redhat.com> | 2007-02-22 12:00:22 +0000 |
|---|---|---|
| committer | Paul Nasrat <pnasrat@redhat.com> | 2007-02-22 12:00:22 +0000 |
| commit | 4eee7e354b2372cdc4c85f56934dfed9cfbcebec (patch) | |
| tree | 3f6c0d8fd88bb45d97b2bc2d8192aa702e17c1d4 /.hgignore | |
| parent | 2a3e33e962cccad1e46714479f17e7211270dd3a (diff) | |
| download | rpm-4eee7e354b2372cdc4c85f56934dfed9cfbcebec.tar.gz rpm-4eee7e354b2372cdc4c85f56934dfed9cfbcebec.tar.bz2 rpm-4eee7e354b2372cdc4c85f56934dfed9cfbcebec.zip | |
Re-enable fileconflicts
This patch re-enables fileconflicts by default (rh#151609).
Diffstat (limited to '.hgignore')
0 files changed, 0 insertions, 0 deletions