![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Aug 2011 00:25:59 +0000 (17:25 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Aug 2011 00:25:59 +0000 (17:25 -0700) | ||
| commit | 660578d4da9d71fbc1e553c95d18987b40af5f0f | |
| tree | 6d353cd12cf5cf928cb2df3c49ba83e0fbbef6b3 | tree | snapshot |
| parent | 253348b2dbb6519c82e6bc3543c652b9727771ed | commit | diff |
| parent | 99694544358b74c14982f2b9769f8804f017672c | commit | diff |
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
* 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 |