Avoid generating no-op conflicts.
authorBruno Haible <bruno@clisp.org>
Mon, 18 Feb 2008 02:36:33 +0000 (03:36 +0100)
committerBruno Haible <bruno@clisp.org>
Mon, 18 Feb 2008 02:36:33 +0000 (03:36 +0100)
commitea180b80e8ba9da7bce84c12175343b964363688
tree9b093e8e642790b7bcde7db5e671960534cf53fe
parent0eb77fc848fa25c1bc36cc82908655c32ae73702
Avoid generating no-op conflicts.
ChangeLog
lib/git-merge-changelog.c