Jakob Borg 936c76119d Index reset should generate file conflicts (fixes #1613) 11 years ago
..
src 936c76119d Index reset should generate file conflicts (fixes #1613) 11 years ago
.gitignore 52cad94e86 Use godep 12 years ago