summaryrefslogtreecommitdiffstats
path: root/figures/git-merge-conflict.svg
AgeCommit message (Expand)Author
2012-05-23figuresStephane Caron