summaryrefslogtreecommitdiff
path: root/doc/bugs/Assistant_having_a_child_git_cat-file_--batch_do_the_same_thing_over_and_over_and_using_a_lot_of_memory/comment_8_03dd76b01f46a7cc66eddac3e054c8ad._comment
blob: d6aa43da05992a246e230544fbfa6f40591d02a2 (plain)
1
2
3
4
5
6
7
8
[[!comment format=mdwn
 username="http://johan.kiviniemi.name/"
 nickname="Johan"
 subject="comment 8"
 date="2014-04-07T22:48:18Z"
 content="""
There are no commits in `master` or `git-annex` that have the word conflict in the description.
"""]]