![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 17 Jan 2010 23:59:40 +0000 (15:59 -0800) | ||
| commit | a0db3e5878fd5fa3f54bcf7042ad3d0cb30e07f2 | |
| tree | 90ef8cc9887affd5aee3c1514fb39db845642b31 | tree | snapshot |
| parent | 42aac96763a72b5bac73d34640d3a0c6233027a6 | commit | diff |
| parent | 6d6f9acc5db0dfae94ef22c9ecbcf7df00f84399 | commit | diff |
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
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh
| builtin-checkout.c | diff1 | | diff2 | | blob | history |
| t/t7201-co.sh | diff1 | | diff2 | | blob | history |