Skip to content

Commit

Permalink
Diff work-around documented
Browse files Browse the repository at this point in the history
Added description of diff work-around which enables usage of plain
diff command but suggests to define custom script for diff. Custom
scripts enables us to properly compare directories and to use colors
for easier comparison.
  • Loading branch information
vvidovic committed Dec 23, 2019
1 parent f717aba commit 20c847f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ F9/9 - clone current DataPower configuration under new name
DEL/x - delete selected (or current if none selected) directories and files
- delete DataPower configuration
d - diff current files/directories
(must be "blocking" - see "Custom external commands" below)
(should be "blocking" - see "Custom external commands" below)
/ - find string
n - find next string
m - show all status messages saved in history
Expand Down Expand Up @@ -213,9 +213,9 @@ calling external commands are set. By default these are "less", "vi" and "ldiff"
but could be any commands. All of those commands should be started in foreground
and should wait for user's input to complete. For example for viewer "less" or
"more" can be used while "cat" will not work. For file comparison normal "diff"
command can't be used but "blocking" diff command must be used like vimdiff or
custom ldiff script which combines diff and less commands can be prepared
(something like:
command can be used as work around but "blocking" diff command should be used
like vimdiff. Custom ldiff script which combines diff and less commands can be
easily prepared (something like:
'diff "$1" "$2" | less'
or for more fancy colored output you can use something like:
'diff -u -r --color=always "$1" "$2" | less -r').
Expand Down
8 changes: 4 additions & 4 deletions help/help.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ DEL/x - delete selected (or current if none selected) directories
- delete DataPower configuration
- delete DataPower object
d - diff current files/directories
(must be "blocking" - see "Custom external commands" below)
(should be "blocking" - see "Custom external commands" below)
/ - find string
n - find next string
m - show all status messages saved in history
Expand Down Expand Up @@ -68,9 +68,9 @@ calling external commands are set. By default these are "less", "vi" and "ldiff"
but could be any commands. All of those commands should be started in foreground
and should wait for user's input to complete. For example for viewer "less" or
"more" can be used while "cat" will not work. For file comparison normal "diff"
command can't be used but "blocking" diff command must be used like vimdiff or
custom ldiff script which combines diff and less commands can be prepared
(something like:
command can be used as work around but "blocking" diff command should be used
like vimdiff. Custom ldiff script which combines diff and less commands can be
easily prepared (something like:
'diff "$1" "$2" | less'
or for more fancy colored output you can use something like:
'diff -u -r --color=always "$1" "$2" | less -r').
Expand Down

0 comments on commit 20c847f

Please sign in to comment.