/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to commit.py

  • Committer: John Arbash Meinel
  • Date: 2007-10-02 19:15:41 UTC
  • mto: (322.1.1 trunk) (330.3.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 368.
  • Revision ID: john@arbash-meinel.com-20071002191541-qra1s73obzvgrf7j
Ensure that we can set per-file messages even during a merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
579
579
                return
580
580
 
581
581
        specific_files, file_info = self._get_specific_files()
 
582
        if self._pending:
 
583
            specific_files = None
582
584
 
583
585
        local = self._check_local.get_active()
584
586