diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-21 22:51:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-21 22:51:32 -0700 |
| commit | 4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279 (patch) | |
| tree | 39b53f3b447c22a63640ac01281937cba5f14f5a /test-mktemp.c | |
| parent | 80f074396d2a5601cdbf643f9b0db09329070a3f (diff) | |
| parent | 76b80cdf17807ba4a773562df2218980ffa27e4f (diff) | |
| download | git-4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279.tar.gz | |
Merge branch 'mm/merge-in-dirty-worktree-doc' into maint
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
Diffstat (limited to 'test-mktemp.c')
0 files changed, 0 insertions, 0 deletions