diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:58:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-27 10:58:07 -0700 |
| commit | 8617715cc09b7422fe31189f9476f6ade73ede70 (patch) | |
| tree | 7c62d215a31c9e990753b2bc1e8aee1870f06c4c /t/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial | |
| parent | Merge branch 'master' of git://git.bogomips.org/git-svn (diff) | |
| parent | More fixes for 1.8.2.1 (diff) | |
| download | tgif-8617715cc09b7422fe31189f9476f6ade73ede70.tar.xz | |
Merge branch 'maint'
* maint:
More fixes for 1.8.2.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 't/t4013/diff.diff-tree_--root_-r_--abbrev=4_initial')
0 files changed, 0 insertions, 0 deletions