diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-01 15:00:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-01 15:00:08 -0700 |
| commit | 1df561fb4861708ce208488aa307516c0ecfa968 (patch) | |
| tree | d642bff3822cc638967d3fc6c54d2060e21ec0cf /userdiff.h | |
| parent | 259bcfb6b987021be592ed640253215bcbbf6d7d (diff) | |
| parent | ff00b682f203eb39876b57404916b4c54b6032c6 (diff) | |
| download | git-1df561fb4861708ce208488aa307516c0ecfa968.tar.gz | |
Merge branch 'jc/maint-reset-unmerged-path'
* jc/maint-reset-unmerged-path:
reset [<commit>] paths...: do not mishandle unmerged paths
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions