diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-25 20:27:50 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-25 20:28:06 +0400 |
| commit | 2a4a26b53d5ad18ded5d79b0cf0b617ebbb758b4 (patch) | |
| tree | 5bb00d5bc31310536d4816689f577ef75dccf44d /Documentation/config.txt | |
| parent | 3ca26e8cdc19f3758a3803358f8ae1a03a4eb2e4 (diff) | |
| parent | 7a0d8db36e1256fd2ac9fa6b97b947e536c2202b (diff) | |
Sync with 'maint'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 3bb53da522..bbba728d09 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -182,7 +182,7 @@ advice.*:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. resolveConflict:: - Advices shown by various commands when conflicts + Advice shown by various commands when conflicts prevent the operation from being performed. implicitIdentity:: Advice on how to set your identity configuration when |