summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-18 17:16:39 -0400
committerJoey Hess <joey@kitenet.net>2010-07-18 17:16:39 -0400
commit1dbb2632ef5f7eaa1f5745d587b1373b45b09e56 (patch)
treee64c08e6741d2e0f317a7a62039a0f15c08662da /plugins
parent2bf3a6edbbd32c66db8480d598c2c328d8a8a1b8 (diff)
another class of conflicts: subdir/file conflicts
Diffstat (limited to 'plugins')
0 files changed, 0 insertions, 0 deletions