comparison .hgignore @ 29:fc8f3ac948df

implement resolving the conflict
author dirk
date Sun, 18 Sep 2011 19:06:59 +0200
parents e4275005761d
children 3201f93801d0
comparison
equal deleted inserted replaced
28:0bed77e3608e 29:fc8f3ac948df