summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorJudd Vinet <judd@archlinux.org>2005-12-26 06:40:29 +0000
committerJudd Vinet <judd@archlinux.org>2005-12-26 06:40:29 +0000
commit58c9d5d66387821260ba9bdd0815568039462f39 (patch)
treed2be58f9dd495c254d8fcefcc86f7fae1d1f0121 /etc
parenta074ddb85b4d1f9b90842e5a4f15e2416e3147fe (diff)
downloadpacman-58c9d5d66387821260ba9bdd0815568039462f39.tar.xz
applied first try at sync conflict handling (VMiklos) plus a couple changes
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions