| commit | 9a17e9ad15f77b739a33da703f695ad924cd825a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Jun 2013 22:07:43 +0000 (26 15:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Jun 2013 22:07:43 +0000 (26 15:07 -0700) | ||
| tree | f2709ce969ea4ee0b87cad88366a69f215f731b1 | treesnapshot (tar.gz zip) |
| parent | a036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d | commitdiff |
| parent | 76b80cdf17807ba4a773562df2218980ffa27e4f | commitdiff |
Merge branch 'mm/merge-in-dirty-worktree-doc'
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |