![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Aug 2011 22:27:30 +0000 (15:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 23 Aug 2011 22:27:30 +0000 (15:27 -0700) | ||
| commit | c9321a0e20f3461cf4ae07a8320aa80480107f24 | |
| tree | 9f8003bd492baaff2eadd7fa0a1e441cdea43a8c | tree | snapshot |
| parent | 36bad9dee0a729f6205ceba3b059139162e01ab5 | commit | diff |
| parent | 99694544358b74c14982f2b9769f8804f017672c | commit | diff |
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
* jc/maint-combined-diff-work-tree:
diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"
Conflicts:
combine-diff.c
| combine-diff.c | diff1 | | diff2 | | blob | history |