|
From: | martin rudalics |
Subject: | Re: Missing changes in merges from emacs-25 to master |
Date: | Tue, 22 Mar 2016 11:58:36 +0100 |
>> Neither do >> >> git show 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa >> git show cb4e054e41cdb7e398351a5ae8224759e721349e > > Try git show -m to see both sides. A diff for a merge commit by default > only shows changes that differ from both sides. Thanks, this seems to show it. But git show -m 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa gets me some 500.000 lines of output. Is there a way to restrict that to src/window.c? martin
[Prev in Thread] | Current Thread | [Next in Thread] |