diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-14 22:32:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-14 22:32:14 -0700 |
| commit | a3cfb7673d419cac3d57ad89e67537288d20696f (patch) | |
| tree | a6366f1e938e2c6b45d8057be7c7bb34ab2c09c6 /gitattributes.txt | |
| parent | f76c10b8a30ffeb8136343eab5ec87651a9e8e8c (diff) | |
| download | git-htmldocs-a3cfb7673d419cac3d57ad89e67537288d20696f.tar.gz | |
Autogenerated HTML docs for v1.7.12-464-g83379
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index e16f3e175..462b79c12 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -927,7 +927,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in macro attribute "binary" is equivalent to: ------------ -[attr]binary -diff -text +[attr]binary -diff -merge -text ------------ |