Opened 3 years ago

Closed 3 years ago

#20565 closed defect (fixed)

Ignore git mergetool backup files

Reported by: cypherpunks Owned by: atagar
Priority: Medium Milestone:
Component: Core Tor/Stem Version:
Severity: Normal Keywords:
Cc: Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

I use git mergetool to handle merge conflicts. The tool leaves .orig files as backups to the original files.

This makes git status complain about untracked files and fails the installation unit test because it detects these files as not being installed.

The attached patch solves both issues.

Child Tickets

Attachments (1)

0001-Ignore-git-mergetool-backup-files.patch (1.1 KB) - added by cypherpunks 3 years ago.

Download all attachments as: .zip

Change History (2)

Changed 3 years ago by cypherpunks

comment:1 Changed 3 years ago by atagar

Resolution: fixed
Status: newclosed

Thanks! Pushed.

Note: See TracTickets for help on using tickets.