models: do not list a file in both the unmerged and modified sections
commitaf7cc1b05922299196237409af351fae9d4dadb5
authorDavid Aguilar <davvid@gmail.com>
Fri, 14 Nov 2008 07:04:23 +0000 (13 23:04 -0800)
committerDavid Aguilar <davvid@gmail.com>
Fri, 14 Nov 2008 07:04:23 +0000 (13 23:04 -0800)
tree2f61ed34897bd7fa7a23e13477f70dbc472a3d83
parenteca3d33342076104ad544405eab55808837b9a4c
models: do not list a file in both the unmerged and modified sections

Signed-off-by: David Aguilar <davvid@gmail.com>
cola/models.py