diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-02-23 14:27:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-23 14:27:55 -0800 |
| commit | 0901d5a2ef80996cf64c8afeaec765e1bc09f795 (patch) | |
| tree | 72b1f5df7b0235174c0affe68ce549d697d762c1 /Documentation | |
| parent | Merge branch 'ml/maint-grep-doc' (diff) | |
| parent | am: remove rebase-apply directory before gc (diff) | |
| download | tgif-0901d5a2ef80996cf64c8afeaec765e1bc09f795.tar.xz | |
Merge branch 'maint'
* maint:
am: remove rebase-apply directory before gc
rerere: fix memory leak if rerere images can't be read
Documentation: mention conflict marker size argument (%L) for merge driver
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitattributes.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index b396a871b3..d892e642ed 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -511,7 +511,8 @@ command to run to merge ancestor's version (`%O`), current version (`%A`) and the other branches' version (`%B`). These three tokens are replaced with the names of temporary files that hold the contents of these versions when the command line is -built. +built. Additionally, %L will be replaced with the conflict marker +size (see below). The merge driver is expected to leave the result of the merge in the file named with `%A` by overwriting it, and exit with zero |