899f056 attempt to resolve can't build or change branch, yet git diff= no changes.

Authored and Committed by dtimms 13 years ago
1 file changed. 3 lines added. 18 lines removed.
    attempt to resolve can't build or change branch, yet git diff= no changes.
    
        
file modified
+3 -18