Martin Renvoize mrenvoize

## neovim-as-merge-tool.md

      
              1 file
            
          
              1 fork
            
          
                3 comments
              
            
              32 stars
            
          
                Pagliacii
                / neovim-as-merge-tool.md
            
            
              Last active
              November 2, 2025 20:55
            
              
                Using Neovim as a merge tool
              
          
    git

Using diffview.nvim

# ~/.gitconfig
[merge]
  tool = diffview
[mergetool]
  prompt = false

  
## regexps-are-fabulous.pl
#!/usr/bin/env perl

# These lines enable newer Perl features (like 'say'), and encourage
# good coding practices.
use v5.10;
use strict;
use warnings;
use autodie;

# Our script will search for strings in the following form:

## mojo-json-patch.pm
package Mojo::JSON::Patch;
use Mojo::Base 'Mojo::JSON::Pointer';

use Carp 'croak';
use Mojo::Path;

sub set {
  my $self = shift;
  my $path = Mojo::Path->new(shift);
  my $val  = shift;

## 2015-01-30.md

      
              5 files
            
          
              0 forks
            
          
                0 comments
              
            
              3 stars
            
          
                ribasushi
                / 2015-01-30.md
            
            
              Last active
              December 29, 2023 22:52
            
              
                The origins of the river of CPAN (QAH 2015)
              
          
    Subject: What I want for Christm^W the QA hackathon
Date: Fri, 30 Jan 2015 12:20:46 +0100
From: Peter Rabbitson <rabbit@rabbit.us>
To: { about 35 people, various stakeholders around Perl and CPAN }

(This mail is addressed to a lot of people, mainly to the list of current participants, and then to some extra folks who I think ought to be in Berlin anyway, and even some more people on BCC. Sorry for taking your collective time)
Greetings!

  
## pg_change_db_owner.sh
#!/bin/sh
#
# The MIT License
#
# Copyright 2014-2017 Jakub Jirutka <jakub@jirutka.cz>.
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

## run.sh
#!/bin/sh

export HOME="/home/me"
export PATH="$HOME/.plenv/bin:$PATH"

eval "$(plenv init -)"

cd $HOME/app

exec carton exec -- "$1"
	#!/usr/bin/env perl

	# These lines enable newer Perl features (like 'say'), and encourage
	# good coding practices.
	use v5.10;
	use strict;
	use warnings;
	use autodie;

	# Our script will search for strings in the following form:
	package Mojo::JSON::Patch;
	use Mojo::Base 'Mojo::JSON::Pointer';

	use Carp 'croak';
	use Mojo::Path;

	sub set {
	my $self = shift;
	my $path = Mojo::Path->new(shift);
	my $val = shift;
	#!/bin/sh
	#
	# The MIT License
	#
	# Copyright 2014-2017 Jakub Jirutka <jakub@jirutka.cz>.
	#
	# Permission is hereby granted, free of charge, to any person obtaining a copy
	# of this software and associated documentation files (the "Software"), to deal
	# in the Software without restriction, including without limitation the rights
	# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
	#!/bin/sh

	export HOME="/home/me"
	export PATH="$HOME/.plenv/bin:$PATH"

	eval "$(plenv init -)"

	cd $HOME/app

	exec carton exec -- "$1"