summaryrefslogtreecommitdiff
path: root/vifm/vifm-help.txt
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2014-11-13 12:46:33 +0000
committerUrbain Vaes <urbain@vaes.uk>2014-11-13 12:46:33 +0000
commit613f28eb886177d1527238c4c6e507a9a0a57aff (patch)
treeebc6a65610055df0bc3edebc3245aa19bfd8b75b /vifm/vifm-help.txt
parentfdc679a630a79d54407db6e6f680936cba907d4f (diff)
parent54c004af0096bf7bc913b76f189bca1e23853113 (diff)
resolving conflict
Diffstat (limited to 'vifm/vifm-help.txt')
0 files changed, 0 insertions, 0 deletions