stage_one: refuse to stage an unmerged file
commit1b2eb4296ce7da6a74a106f2acd8dd011e7f2e17
authorSteven Walter <stevenrwalter@gmail.com>
Fri, 11 Jul 2008 03:51:49 +0000 (10 23:51 -0400)
committerSteven Walter <stevenrwalter@gmail.com>
Fri, 11 Jul 2008 03:51:49 +0000 (10 23:51 -0400)
tree2b5eb7710f77d542be27c433dfeca059672d6ef2
parent50e8a3f574797ccb77a9674d42f7d622fa676d31
stage_one: refuse to stage an unmerged file
yap/yap.py