diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:18:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 13:18:07 -0700 |
| commit | e7734c6c9b04d78e970b8de4765cdebd984ec6e6 (patch) | |
| tree | 5b82e7fdb271f0f414e56916bb5dd7d653ed2e93 /server-info.c | |
| parent | c33e30675b601d6707dc4022a8f64812509c7566 (diff) | |
| parent | dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3 (diff) | |
| download | git-e7734c6c9b04d78e970b8de4765cdebd984ec6e6.tar.gz | |
Merge branch 'gb/maint-am-patch-format-error-message'
* gb/maint-am-patch-format-error-message:
am: format is in $patch_format, not parse_patch
Conflicts:
git-am.sh
Diffstat (limited to 'server-info.c')
0 files changed, 0 insertions, 0 deletions