Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge5 @ 2162:dac432a521d8
Add self to CONTRIBUTORS
author | Colin McMillen <mcmillen@cs.cmu.edu> |
---|---|
date | Sun, 30 Apr 2006 18:52:34 +0200 |
parents | 39eb64b23cb5 |
children | 41989e55fa37 |
author | Colin McMillen <mcmillen@cs.cmu.edu> |
---|---|
date | Sun, 30 Apr 2006 18:52:34 +0200 |
parents | 39eb64b23cb5 |
children | 41989e55fa37 |