global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
bd2c86ef00f032be925edacfc2d284ab9b6b9eab
git/combine-diff.c
Junio C Hamano c9321a0e20 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
2011-08-23 15:27:30 -07:00

30 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink