Mercurial > hgrepos > DevTools > mercurial-extensions
diff VERSION @ 269:1e375da37f2e
First part of testing the a merge with yields conflicts (with tool ":merge3")
| author | Franz Glasner <hg@dom66.de> |
|---|---|
| date | Fri, 04 Jan 2019 17:09:30 +0100 |
| parents | 4b2ec744e39e |
| children | 25fa0a15b457 |
