summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2006-01-07 18:01:26 +0000
committerAurelien Foret <aurelien@archlinux.org>2006-01-07 18:01:26 +0000
commit02694534be2c9822a5129cb536c057712aa85d95 (patch)
treeafbdc6af61fb986bdc99bcb50d78a2c3fb3c55df /src
parentbde9d69636a2f1842be83e4cd36188b66df74e26 (diff)
Fixed a regression in the conflict handling code
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions