diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:41:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-05 14:41:40 -0700 |
| commit | d2dbd399fa03b37ce797ed6fc609574a7e677079 (patch) | |
| tree | e594a762555b0afe94b675d5b57e55f5d54f64c3 /Documentation/git-merge-one-file.txt | |
| parent | Update draft release notes after merging the first batch of topics (diff) | |
| parent | Merge branch 'nd/fetch-pack-shallow-fix' into maint (diff) | |
| download | tgif-d2dbd399fa03b37ce797ed6fc609574a7e677079.tar.xz | |
Sync with maint
* maint:
Documentation/git-merge.txt: fix formatting of example block
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions