Ignore merged status of the file-level merge
authorAlex Riesen <raa.lkml@gmail.com>
Thu, 26 Apr 2007 19:13:49 +0000 (21:13 +0200)
committerJunio C Hamano <junkio@cox.net>
Thu, 26 Apr 2007 23:11:39 +0000 (16:11 -0700)
commit0d5e6c9...81aae33795243452fd50663d17ec2b9d
tree0448c4e...64b66fe838c83f60b38f01464c9c9547copy hash to clipboard (tree)
parent8a35981...273a4460d5806d2d5e76cd7993a84843copy hash to clipboard (diff)
merge-recursive.c