CHANGELOG.md
18.2 KB
-
Merge pull request #3139 from ethomson/diff_conflicts · ff8d635a
Include conflicts when diffing
Carlos Martín Nieto committed
To find the state of this project's repository at the time of any of these versions, check out
the tags.