projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: addafaf) | patch
diff-files -c/--cc: combine only when both ours and theirs exist.
authorJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 10:09:08 +0000 (02:09 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 28 Jan 2006 10:26:18 +0000 (02:26 -0800)
commit939aabbf7d108b5d6830bf5cd89abc910cc9ff27
treea8844082231917ae1010fea74f6d31fc370a59fbtree | snapshot
parentaddafaf92eeb86033da91323d0d3ad7a496dae83commit | diff
diff-files -c/--cc: combine only when both ours and theirs exist.

The previous round forgot to make sure there actually are two
versions to compare against the working tree version.  Otherwise
using -c/--cc would not make much sense.

Also plug a small memory leak.

Signed-off-by: Junio C Hamano <junkio@cox.net>
diff-files.c diff | blob | history
The core git plumbing