diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-03 13:52:54 -0800 |
| commit | 24807f9d5bada2475fddd153365c1debfe1309bc (patch) | |
| tree | 5a16341ed3e937e0af47f57a6acbebe0df18f9cb /diff.h | |
| parent | d718c19bc686a15ed69cd7631e50613dd4901e03 (diff) | |
| parent | e63ec003b2a0c89f0c1cbc4862dcef7c4a14a785 (diff) | |
Merge branch 'mm/maint-hint-failed-merge' into maint
* mm/maint-hint-failed-merge:
user-manual: Document that "git merge" doesn't like uncommited changes.
merge-recursive: point the user to commit when file would be overwritten.
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions