diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-19 15:49:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-19 15:49:24 -0700 |
| commit | 6baa9bd882fe003478c42ee5709dcfc713e13ec9 (patch) | |
| tree | 4b69a00457e22edcecc6d6e91d74d25b53ebf5d7 /diffcore-order.c | |
| parent | 0a4139b5f283ef5e817afaafd9e7e2a149220cc4 (diff) | |
| parent | f7bff00314f473be1ef6c166e91447fabd1822d8 (diff) | |
| download | git-6baa9bd882fe003478c42ee5709dcfc713e13ec9.tar.gz | |
Merge branch 'jc/sha1-name-find-fix' into maint
* jc/sha1-name-find-fix:
sha1_name.c: fix parsing of ":/token" syntax
Conflicts:
sha1_name.c
Diffstat (limited to 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions