diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-10 21:54:15 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-10 21:54:15 +0100 |
| commit | a42332c21723fde9f36b579f6b39a23aa1aac137 (patch) | |
| tree | abeda76e7d7f4f38f2536ae2967eb6d1d6fcba15 /userdiff.h | |
| parent | Merge branch 'rs/maint-archive-match-pathspec' into maint (diff) | |
| parent | checkout -m path: fix recreating conflicts (diff) | |
| download | git-a42332c21723fde9f36b579f6b39a23aa1aac137.tar.xz git-a42332c21723fde9f36b579f6b39a23aa1aac137.zip | |
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint
* jc/maint-1.6.1-checkout-m-custom-merge:
checkout -m path: fix recreating conflicts
Conflicts:
t/t7201-co.sh
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions