diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:43 -0700 |
| commit | 9a17e9ad15f77b739a33da703f695ad924cd825a (patch) | |
| tree | f2709ce969ea4ee0b87cad88366a69f215f731b1 /resolve-undo.c | |
| parent | Merge branch 'kb/diff-blob-blob-doc' (diff) | |
| parent | Documentation/git-merge.txt: weaken warning about uncommited changes (diff) | |
| download | tgif-9a17e9ad15f77b739a33da703f695ad924cd825a.tar.xz | |
Merge branch 'mm/merge-in-dirty-worktree-doc'
* mm/merge-in-dirty-worktree-doc:
Documentation/git-merge.txt: weaken warning about uncommited changes
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions