Documentation: describe 'union' low-level merge driver

diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 385ecc900f2d7f4c982a96f1a97607334682e074..895d7503100632f5ab79af548fed3b3a6d79c413 100644 (file)
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -152,7 +152,7 @@ definition impossible to preserve signatures at any rate.)
        does this in the '.git-rewrite/' directory but you can override
        that choice by this parameter.
 
--f\|--force::
+-f|--force::
        `git filter-branch` refuses to start with an existing temporary
        directory or when there are already refs starting with
        'refs/original/', unless forced.