diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:25:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-17 17:25:59 -0700 |
| commit | 660578d4da9d71fbc1e553c95d18987b40af5f0f (patch) | |
| tree | 6d353cd12cf5cf928cb2df3c49ba83e0fbbef6b3 /builtin | |
| parent | 253348b2dbb6519c82e6bc3543c652b9727771ed (diff) | |
| parent | 99694544358b74c14982f2b9769f8804f017672c (diff) | |
| download | git-660578d4da9d71fbc1e553c95d18987b40af5f0f.tar.gz | |
Merge branch 'jc/maint-combined-diff-work-tree'
* jc/maint-combined-diff-work-tree:
diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
Conflicts:
combine-diff.c
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions