diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:07:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 18:07:07 -0800 |
| commit | bd6ba4d28bf75b0857b3c81aa8bca8e454d9e79e (patch) | |
| tree | d3b4b2163d6be4e4dd8aade29ba85a9480dccd8a /Documentation/git-merge.txt | |
| parent | Merge branch 'mh/work-tree' (diff) | |
| parent | Add Documentation/CodingGuidelines (diff) | |
| download | tgif-bd6ba4d28bf75b0857b3c81aa8bca8e454d9e79e.tar.xz | |
Merge branch 'maint'
* maint:
Add Documentation/CodingGuidelines
When exec() fails include the failing command in the error message
RelNotes-1.5.3.5: fix another typo
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions