Merge branch 'jc/maint-combined-diff-work-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Aug 2011 22:27:30 +0000 (15:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Aug 2011 22:27:30 +0000 (15:27 -0700)
commitc9321a0...20f3461cf4ae07a8320aa80480107f24
tree9f8003b...492baaff2eadd7fa0a1e441cdea43a8ccopy hash to clipboard (tree)
parent36bad9d...e0a729f6205ceba3b059139162e01ab5copy hash to clipboard (diff)
parent9969454...358b74c14982f2b9769f8804f017672ccopy hash to clipboard (diff)
combine-diff.c