cmd_unstage: don't mark conflicting files as resolved
commit00e917dcb4f8adf9210bfec02ac1aaa49f9f0382
authorSteven Walter <swalter@lpdev.prtdev.lexmark.com>
Tue, 5 Aug 2008 15:18:27 +0000 (5 11:18 -0400)
committerSteven Walter <swalter@lpdev.prtdev.lexmark.com>
Wed, 6 Aug 2008 17:42:19 +0000 (6 13:42 -0400)
tree5fc3054f92381c161518ff367bd2ccedf53d81eb
parentf328f649fe5947eadeef5d192afb39fde4441aa1
cmd_unstage: don't mark conflicting files as resolved
yap/yap.py