git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a35981)
Ignore merged status of the file-level merge
authorAlex Riesen <redacted>
Thu, 26 Apr 2007 19:13:49 +0000 (21:13 +0200)
committerJunio C Hamano <redacted>
Thu, 26 Apr 2007 23:11:39 +0000 (16:11 -0700)
commit0d5e6c9781aae33795243452fd50663d17ec2b9d
tree0448c4e964b66fe838c83f60b38f01464c9c9547tree | snapshot
parent8a359819273a4460d5806d2d5e76cd7993a84843commit | diff
Ignore merged status of the file-level merge

as it is not relevant for whether the result should be written.
Even if no real merge happened, there might be _no_ reason to
rewrite the working tree file. Maybe even more so.

Signed-off-by: Alex Riesen <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT