paulaltin git-hires-merge issues

paulaltin / git-hires-merge

An interactive git merge driver which can resolve non-overlapping conflicts on individual or adjacent lines.

GNU General Public License v3.0

62 stars 8 forks source link

issues

Newest

Newest Most commented Recently updated Oldest Least commented Least recently updated

Quote a regex string

#24 mernst closed 4 months ago
1
Vendor strtobool to fix python 3.12

#23 SuperSandro2000 closed 8 months ago
1
Support interactive.singlekey

#22 SuperSandro2000 opened 11 months ago
0
distutils deprecation

#21 SuperSandro2000 closed 8 months ago
1
Document dependency on Gnu diff

#20 dabrahams closed 1 year ago
3
Diff coloring does not work on macOS 13 Ventura

#19 paulaltin opened 1 year ago
4
Make it work out-of-the-box on MacOS

#18 dabrahams closed 1 year ago
5
Rename it?

#17 dabrahams closed 1 year ago
3
Add ability to edit subline merge result

#15 paulaltin closed 1 year ago
1
"Run manually on a conflicted file" should be shown in the README

#14 dabrahams closed 4 years ago
1
No output for merge resolution?

#13 dabrahams closed 4 years ago
6
Print result in non-interactive mode, and auto-detect support for color and interactive execution.

#12 paulaltin closed 5 years ago
0
Add command line help text and improve argument parsing.

#11 paulaltin closed 5 years ago
0
Detect support for ANSI escape sequences

#10 paulaltin closed 5 years ago
2
Even in non-interactive mode, I'd like to inspect the results

#9 dabrahams closed 5 years ago
9
invalid literal for int() with base 10: ''

#8 dabrahams closed 5 years ago
2
Non interactive

#7 paulaltin closed 5 years ago
0
Fix constant / env var names

#6 dabrahams closed 5 years ago
1
Give me a way to go non-interactive

#5 dabrahams closed 5 years ago
16
Interactive session when rebasing from Magit is broken

#4 dabrahams opened 5 years ago
17
Allow invoking script manually on a conflicted file from the command …

#3 paulaltin closed 5 years ago
0
Please add a script for one-time subline merge

#2 dabrahams closed 5 years ago
7
Correct check of empty git editor config

#1 benizl closed 6 years ago
1