mergetools/p4merge: swap LOCAL and REMOTE

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 481736a471d67d11f9bda3429b342132236b12f9..bbba728d09bbb578f86c1ef171d24b53c1178fa3 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -182,7 +182,7 @@ advice.*::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.
        resolveConflict::
-               Advices shown by various commands when conflicts
+               Advice shown by various commands when conflicts
                prevent the operation from being performed.
        implicitIdentity::
                Advice on how to set your identity configuration when
@@ -1811,7 +1811,8 @@ push.default::
   +
   This is currently the default, but Git 2.0 will change the default
   to `simple`.
-* `upstream` - push the current branch to its upstream branch.
+* `upstream` - push the current branch to its upstream branch
+  (`tracking` is a deprecated synonym for this).
   With this, `git push` will update the same remote ref as the one which
   is merged by `git pull`, making `push` and `pull` symmetrical.
   See "branch.<name>.merge" for how to configure the upstream branch.