Han-Wen Nienhuys <[EMAIL PROTECTED]> writes: > commit 53f4876abcebf3f05d2a88bba3a898ddcda25a74 > Merge: 69f2317... 242ebea... > Author: Ludovic Courtès <[EMAIL PROTECTED]> > Date: Tue Sep 9 22:03:42 2008 +0200 > > Merge branch 'master' into strftime-gnulib > > Conflicts: > libguile/ChangeLog > srfi/ChangeLog > test-suite/ChangeLog > > > I thought we were supposed to keep the history linear; did I > miss something?
No, *I* did. Strange, I didn't notice it in "git whatchanged", and I don't get why there were conflicts in the first place since said files were left untouched... Thanks, Ludo'.
