about summary refs log tree commit diff stats
path: root/doc/ranger.pod
diff options
context:
space:
mode:
authortoonn <toonn@toonn.io>2019-12-22 16:46:58 +0100
committertoonn <toonn@toonn.io>2019-12-22 16:46:58 +0100
commit3f8e7c14103a6570b0e55fbcf84242c86f42a7cb (patch)
treea902842f2f683ef5bd9930a537f31dd9f6fe4cad /doc/ranger.pod
parent3fc1f4c47c7bc64dd75d0b26e97eb981467466cc (diff)
parentf6c4d5f802b1b3a4c26393d28a11e5b098e802a0 (diff)
downloadranger-3f8e7c14103a6570b0e55fbcf84242c86f42a7cb.tar.gz
Merge branch 'laktak-paste_conflict'
Diffstat (limited to 'doc/ranger.pod')
-rw-r--r--doc/ranger.pod4
1 files changed, 4 insertions, 0 deletions
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.