]> git.michaelhowe.org Git - packages/o/openafs.git/commit
projects / packages / o / openafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9b61f58) | patch
disconnected-merge-conflict-20080630
authorRuss Allbery <rra@stanford.edu>
Mon, 30 Jun 2008 23:53:22 +0000 (23:53 +0000)
committerRuss Allbery <rra@stanford.edu>
Mon, 30 Jun 2008 23:53:22 +0000 (23:53 +0000)
commit99c1e0beb1b7aebfe7f3f10b73da8b6795d11464
tree10e1ab00f65607d7f4dafb7b341b411593858aaftree | snapshot
parent9b61f58fa78259eb092350599a0a26d75ac14fa8commit | diff
disconnected-merge-conflict-20080630

LICENSE BSD

Fix a disconnected-mode merge conflict with an older import of disconnected
to HEAD that caused a duplicate definition of PDiscon.  I believe this
problem was only on HEAD.
src/afs/afs_pioctl.c diff | blob | history