global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 03:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
6ab0b4bc450dcde3fee798e33a67af27c3cab561
git/combine-diff.c
Junio C Hamano 976a4d4f8a Merge branch 'jc/maint-combined-diff-work-tree' into next 
* 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-05 15:06:51 -07:00

30 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink