summaryrefslogtreecommitdiff
path: root/tests.merging/conflict-chunks.stderr
Commit message (Collapse)AuthorAgeFilesLines
* Split merge tests out from the other branching testsSam Thursfield2012-10-291-0/+1
Merge is by far the most complex of the branching and merging commands.