diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-02-24 01:12:54 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-02-24 01:12:54 +0000 |
| commit | 86660db0e9fd6802c7497256f578a35d718a0503 (patch) | |
| tree | 8a792b59b396e4e2702c373b30e077e4f57df321 /gitattributes.txt | |
| parent | 74a198f6cddc06d2bdd1aa65774f9d76400cf914 (diff) | |
| download | git-htmldocs-86660db0e9fd6802c7497256f578a35d718a0503.tar.gz | |
Autogenerated HTML docs for v1.7.0-87-g0901d
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index b396a871b..d892e642e 100644 --- a/gitattributes.txt +++ b/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 |