← Back to branch summary

~foxtrotgps-team/foxtrotgps/trunk

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Paul Wise
  • Date: 2020-08-06 03:12:54 UTC
  • Revision ID: pabs3@bonedaddy.net-20200806031254-ii1t90q816ocwisl
Use --include-merged to get merge commits in the bzr log

The --include-merges appears to have been a typo and
it has probably never worked.

Fixes: bzr revno: 170

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
15
15
bzr_dirstate = $(wildcard .bzr/checkout/dirstate)
16
16
 
17
17
ChangeLog: $(bzr_dirstate)
18
 
        (bzr log --verbose --include-merges || \
 
18
        (bzr log --verbose --include-merged || \
19
19
        bzr log --verbose) | fmt -s > $@.tmp && mv $@.tmp $@
20
20
 
21
21
# Copy all the spec files. Of course, only one is actually used.