.hgignore @ bbc5193de145
Fix conflict marker regexes.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Thu, 03 Nov 2011 11:15:10 -0400 |
| parents | 7274a307b439 |
| children | 7a4fe11d400e |
Fix conflict marker regexes.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Thu, 03 Nov 2011 11:15:10 -0400 |
| parents | 7274a307b439 |
| children | 7a4fe11d400e |