Document --unified/-U option

diff --git a/git-merge.sh b/git-merge.sh
index 485253032adf002f9c5845091b5e93aa50f26b80..5ccf28251d51d3ee10675d48cf04829f5d6d8c06 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -496,9 +496,6 @@ Conflicts:
                sed -e 's/^[^   ]*      /       /' |
                uniq
        } >>"$GIT_DIR/MERGE_MSG"
-       if test -d "$GIT_DIR/rr-cache"
-       then
-               git rerere
-       fi
+       git rerere
        die "Automatic merge failed; fix conflicts and then commit the result."
 fi