diff options
| author | toonn <toonn@toonn.io> | 2019-12-22 16:46:58 +0100 |
|---|---|---|
| committer | toonn <toonn@toonn.io> | 2019-12-22 16:46:58 +0100 |
| commit | 3f8e7c14103a6570b0e55fbcf84242c86f42a7cb (patch) | |
| tree | a902842f2f683ef5bd9930a537f31dd9f6fe4cad /doc | |
| parent | 3fc1f4c47c7bc64dd75d0b26e97eb981467466cc (diff) | |
| parent | f6c4d5f802b1b3a4c26393d28a11e5b098e802a0 (diff) | |
| download | ranger-3f8e7c14103a6570b0e55fbcf84242c86f42a7cb.tar.gz | |
Merge branch 'laktak-paste_conflict'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ranger.1 | 6 | ||||
| -rw-r--r-- | doc/ranger.pod | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1 index b9c46d54..6b23bbfb 100644 --- a/doc/ranger.1 +++ b/doc/ranger.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "RANGER 1" -.TH RANGER 1 "ranger-1.9.2" "2019-12-21" "ranger manual" +.TH RANGER 1 "ranger-1.9.2" "2019-12-22" "ranger manual" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -677,6 +677,10 @@ also \*(L"da\*(R", \*(L"dr\*(R" and \*(L"dt\*(R" shortcuts equivalent to \*(L"ya .IX Item "pp" Paste the files which were previously copied or cut, like pressing Ctrl+V in modern \s-1GUI\s0 programs. +.Sp +Conflicts will be renamed by appending an '_' (and a counter if necessary), +resulting in \f(CW\*(C`file.ext_\*(C'\fR, \f(CW\*(C`file.ext_0\*(C'\fR, etc. If you prefer \f(CW\*(C`file_.ext\*(C'\fR you +can use the \f(CW\*(C`paste_ext\*(C'\fR command. .IP "po" 14 .IX Item "po" Paste the copied/cut files, overwriting existing files. diff --git a/doc/ranger.pod b/doc/ranger.pod index a955efd8..4f53ae35 100644 --- a/doc/ranger.pod +++ b/doc/ranger.pod @@ -638,6 +638,10 @@ also "da", "dr" and "dt" shortcuts equivalent to "ya", "yr" and "yt".) Paste the files which were previously copied or cut, like pressing Ctrl+V in modern GUI programs. +Conflicts will be renamed by appending an '_' (and a counter if necessary), +resulting in C<file.ext_>, C<file.ext_0>, etc. If you prefer C<file_.ext> you +can use the C<paste_ext> command. + =item po Paste the copied/cut files, overwriting existing files. |