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 /entry.c | |
| parent | Merge branch 'cb/maint-exec-error-report' (diff) | |
| parent | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" (diff) | |
| download | tgif-660578d4da9d71fbc1e553c95d18987b40af5f0f.tar.xz | |
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 'entry.c')
0 files changed, 0 insertions, 0 deletions