Mercurial > hg-website
diff .hgignore @ 126:9655e0018355
Added a resolve part for merging.
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Fri, 01 May 2009 13:51:27 +0200 |
parents | 02a52c631816 |
children | da046d9398fe |
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Fri, 01 May 2009 13:51:27 +0200 |
parents | 02a52c631816 |
children | da046d9398fe |