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 /contrib | |
| parent | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint (diff) | |
| parent | Documentation/git-merge.txt: weaken warning about uncommited changes (diff) | |
| download | tgif-4f9f1f5d56e4b41cadeaaa8c89eb567ed9eb7279.tar.xz | |
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 'contrib')
0 files changed, 0 insertions, 0 deletions