Mercurial > hg > mercurial-crew-with-dirclash
diff doc/Makefile @ 3118:7a635ef25132
merge: simplify tests for local changed/remote deleted
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 17 Sep 2006 20:18:27 -0500 |
parents | 3840cefa5222 |
children | 3bdeca8946a6 |