Mercurial > hg > easyhg
diff panner.cpp @ 159:087d7cdde662
* Add InConflict state (not yet used)
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 12:29:57 +0000 |
parents | d66fcf2e0342 |
children | a6d336837ebe |
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 12:29:57 +0000 |
parents | d66fcf2e0342 |
children | a6d336837ebe |