- I am of two minds about this one. diff output must always be
- -p1 format no matter where the command was started, and
- ls-tree might be easier to use if it matched diff, not
- ls-files.
+ <43CC695E.2020506@codeweavers.com>
+
+* Decide what the right thing to do upon an empty merge commit,
+ when both branches happen to have obtained the same set of
+ changes through different history. Not recording such keeps
+ the history simpler, and the next merge would soon create a
+ true merge commit anyway, but this does not feel quite right.
+
+ <20060114021800.4688.qmail@web31803.mail.mud.yahoo.com>