![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 14:48:44 +0000 (07:48 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jun 2009 14:48:44 +0000 (07:48 -0700) | ||
| commit | 456cb4cf3ef6e3dec637b7061b0c834b62eba0f5 | |
| tree | 193fa9cb1011cc29e72e082e1d3d83cfe65ae841 | tree | snapshot |
| parent | 3489428367e0d9d95cf90a8a7f537db958f9a78a | commit | diff |
| parent | 5719db91ce5915ee07c50f1afdc94fe34e91529f | commit | diff |
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
* cb/maint-1.6.0-xdl-merge-fix:
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
Conflicts:
xdiff/xmerge.c
* cb/maint-1.6.0-xdl-merge-fix:
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
Conflicts:
xdiff/xmerge.c
| t/t6023-merge-file.sh | diff1 | | diff2 | | blob | history |
| xdiff/xmerge.c | diff1 | | diff2 | | blob | history |