diff-files -c/--cc: combine only when both ours and theirs exist.
[git.git] / combine-diff.c
2006-01-28 Junio C HamanoMerge lt/revlist,jc/diff,jc/revparse,jc/abbrev
2006-01-28 Junio C Hamanodiff-files: -c and --cc options.
2006-01-28 Junio C Hamanocombine-diff: better hunk splitting.
2006-01-28 Junio C Hamanodiff-tree --cc: squelch header generation on empty...
2006-01-28 Junio C Hamanocombine-diff: extend --cc logic to Octopus.
2006-01-28 Junio C Hamanocombine-diff: minor output changes.
2006-01-28 Junio C Hamanocombine-diff: fix appending at the tail of a list.
2006-01-28 Junio C Hamanodiff-tree --cc: denser combined diff output for a merge...
2006-01-28 Junio C Hamanodiff-tree -c: show a merge commit a bit more sensibly.