Andrey Pankov apankov

## keybase.md

      
              1 file
            
          
              0 forks
            
          
              0 comments
            
          
              0 stars
            
          
                apankov
                / keybase.md
            
            
              Created
              June 10, 2017 08:14
            
          
    Keybase proof

I hereby claim:

I am apankov on github.
I am apankov (https://keybase.io/apankov) on keybase.
I have a public key ASCzJ4CgCt9f6IGBaTj9Ln9-pJaUryDXN5OMvL-IMrtIaAo

To claim this, I am signing this object:

  
## gpg-merge
#!/bin/bash

# Merge tool for Mercurial
# It allows to merge binary GPG-encrypted files. After decryption files are compared with vimdiff

# [merge-tools]
# gpg-merge.executable = ~/bin/gpg-merge
# gpg-merge.priority = 100
# gpg-merge.premerge = False
# gpg-merge.args = $local $other $base $output --recipient foo@example.com
	#!/bin/bash

	# Merge tool for Mercurial
	# It allows to merge binary GPG-encrypted files. After decryption files are compared with vimdiff

	# [merge-tools]
	# gpg-merge.executable = ~/bin/gpg-merge
	# gpg-merge.priority = 100
	# gpg-merge.premerge = False
	# gpg-merge.args = $local $other $base $output --recipient foo@example.com