diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:51:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:51:10 -0700 |
| commit | d011ab4312a8ddabd143567fa9706b8e9fb9c0a4 (patch) | |
| tree | a7167cc0ece6125ff59ba1fc6ae78119f863017d /merge-recursive.c | |
| parent | More corrections for 1.8.2.1 (diff) | |
| parent | merge-tree: fix typo in merge-tree.c::unresolved (diff) | |
| download | tgif-d011ab4312a8ddabd143567fa9706b8e9fb9c0a4.tar.xz | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
merge-tree: fix typo in merge-tree.c::unresolved
git-commit doc: describe use of multiple `-m` options
git-pull doc: fix grammo ("conflicts" is plural)
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions