mergetools/p4merge: swap LOCAL and REMOTE

diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt
index 99388bd3744dd593a97dbf34c022d4d5125bba6c..c600b61e2b62013366476807c733837c0e854165 100644 (file)
--- a/Documentation/git-whatchanged.txt
+++ b/Documentation/git-whatchanged.txt
@@ -24,7 +24,7 @@ This manual page describes only the most frequently used options.
 OPTIONS
 -------
 -p::
-       Show textual diffs, instead of the git internal diff
+       Show textual diffs, instead of the Git internal diff
        output format that is useful only to tell the changed
        paths and their nature of changes.
 
@@ -36,7 +36,7 @@ OPTIONS
        exclusive, top inclusive).
 
 -r::
-       Show git internal diff output, but for the whole tree,
+       Show Git internal diff output, but for the whole tree,
        not just the top level.
 
 -m::
@@ -53,12 +53,12 @@ include::pretty-formats.txt[]
 
 Examples
 --------
-git whatchanged -p v2.6.12.. include/scsi drivers/scsi::
+`git whatchanged -p v2.6.12.. include/scsi drivers/scsi`::
 
        Show as patches the commits since version 'v2.6.12' that changed
        any file in the include/scsi or drivers/scsi subdirectories
 
-git whatchanged --since="2 weeks ago" \-- gitk::
+`git whatchanged --since="2 weeks ago" -- gitk`::
 
        Show the changes during the last two weeks to the file 'gitk'.
        The "--" is necessary to avoid confusion with the *branch* named