diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:59:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 15:59:40 -0800 |
| commit | a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2 (patch) | |
| tree | 90ef8cc9887affd5aee3c1514fb39db845642b31 /builtin-blame.c | |
| parent | 42aac96763a72b5bac73d34640d3a0c6233027a6 (diff) | |
| parent | 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 (diff) | |
| download | git-a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2.tar.gz | |
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge'
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh
Diffstat (limited to 'builtin-blame.c')
0 files changed, 0 insertions, 0 deletions