summaryrefslogtreecommitdiff
path: root/share/man
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2007-01-28 02:04:46 +0000
committerJoris Vink <joris@cvs.openbsd.org>2007-01-28 02:04:46 +0000
commit36c64f8f20b0a2ff5a43fbf4f9a23b6aa3f65652 (patch)
tree967c1006924cdd47b4617230271dfaaa39498cf6 /share/man
parentfbed64cc1fb56f9ce86017aab6f2a884eebf6472 (diff)
add merging support in both local and remote sides.
tested by many, thanks.
Diffstat (limited to 'share/man')
0 files changed, 0 insertions, 0 deletions