diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:27:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-23 15:27:30 -0700 |
| commit | c9321a0e20f3461cf4ae07a8320aa80480107f24 (patch) | |
| tree | 9f8003bd492baaff2eadd7fa0a1e441cdea43a8c /t/t3900 | |
| parent | Merge branch 'cb/maint-exec-error-report' into maint (diff) | |
| parent | diff -c/--cc: do not mistake "resolved as deletion" as "use working tree" (diff) | |
| download | tgif-c9321a0e20f3461cf4ae07a8320aa80480107f24.tar.xz | |
Merge branch 'jc/maint-combined-diff-work-tree' into maint
* 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 't/t3900')
0 files changed, 0 insertions, 0 deletions