gpo.zugaina.org

Search Portage & Overlays:

app-vim/splice

vim plugin: resolve conflicts during three-way merges

Screenshots

  • splice-1.1.0-r4
    amd64 x86
    python_single_target_python3_9 python_single_target_python3_10

    View      Download      Browse     License: MIT   
    Overlay: gentoo

ChangeLog

commit 6bb6db6bc98d02bfccc3cc3af9a7621642a2df98
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sat May 27 12:10:41 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: a4df07aa2d26f8d51ed54dfd2bcd21fb92b20d00

commit 3125e706a7baaed16c28226342866df56afc1edf
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sun Apr 30 00:11:34 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: e137fbe05d07148f288e0c3233dd48294926b33d

commit bb1a5431556e0b47702acaebab802a0d245ebcde
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Fri Apr 21 12:12:27 2017 -0600

merged from funtoo-staging

merged:

funtoo-staging: a4d8e75e1865beae6397f9583ddf77e7be50212f

commit 5fd09132b758233e1f9c24704e832f96df19683b
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Wed Mar 1 00:13:24 2017 -0700

merged from funtoo-staging

merged:

funtoo-staging: d605f51aadda4424f4d767132f6c9c99218c6f66

commit 3f9298c124e45a0ece96cbbd907770c198d0e080
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Oct 31 12:49:16 2016 -0600

merged from funtoo-staging

merged:

funtoo-staging: 83a031b677531490ea6ed2f8d854025a071c454d

commit 3549ddbcd43f6a95226fc79bcbed34a71973b900
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Wed Jan 27 01:12:39 2016 -0700

merged from funtoo-staging

merged:

funtoo-staging: 3c6d53b50924e85ee45686ebd1cde275bd1895fc

commit 036b58e02ab7705e278be674c00bb133bd333f6c
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Fri Oct 2 15:16:35 2015 +0000

merged from funtoo-staging

merged:

funtoo-staging: 7e8b54bacd25ca76003f5f7ed8aa01588ce66178

commit 598ded5ea89821a0d724c8993405c45042b3d82e
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Aug 25 00:26:24 2015 +0000

merged from funtoo-staging

merged:

funtoo-staging: 4322619cb1872cc9dbe0fa1fdcd184a3642bac32

commit 0099bee1c097c4e9ad62cbba61b9ef6c5abc8471
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Aug 24 12:27:16 2015 +0000

merged from funtoo-staging

merged:

funtoo-staging: ccd94e33817483691f8e043d7189fe44803aa808

commit 89cc3c4a2ec900bafe261c635084614d240105ec
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Aug 11 04:10:59 2015 +0000

merged from funtoo-staging

merged:

funtoo-staging: 90795ffd7b6d717be93874c2cfb775f3c3bb5169

commit 05aaacdc1f449250374c3f480970bba267583968
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Wed Apr 8 08:24:56 2015 +0000

merged from funtoo-staging

merged:

funtoo-staging: 7c9e4334c0abba35b33e5c3de1ce08b543aa83e6

commit 9e89b9177be1057208ab73b6f6d361d25c5ca7a5
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Jan 6 14:17:29 2015 +0000

glorious funtoo updates

merged:

bar-overlay: e29c88fad87f3aab32f058943dc1d4a409b4ae85
bliss-overlay: 10e4780332539b3607d2a669b73d59d601f2772f
squeezebox: cf7953988018d60d3638245b380406be494bd7ae
funtoo-deadbeef: 84848f7b806973a9b4ae4fc2eb4e546fddfc4442
funtoo-redhat: bbf9b3d93340f431421f38ec0f07395edd18ac1a
funtoo-wmfs: 9f97ae675241901f470402ac27373b11512982ea
vmware: b98ffa6d5d97a41a8b7be0a258a5adf92ed2de27
miramir: 87e12178bc3aea6707a4d8d9f2ed5cb08d4551b2
sera: 97b0bfd1f11402ba2185f151efa5fbd1641601fa
faustoo: 031fa6de6bd560b2d39c1f36a13114715296be4b
foo-overlay: 44af5419fabdb2f70469f6696330eac1c37b60d9
funtoo-plex: 053d584c4eeb8a92363b19249abe4f5c8bf1012b
causes: de5d9f094914b599b3aa98732b08bcb512af7056
sabayon-for-gentoo: 35bc7d64dfd938872da7c5f3528c4eba2da5990b
funtoo-gnome: 8cd441aad4cbe626e0152e75b9423c1d60cfb431
funtoo-mysql: 3b829e294896cf4ba866ef24865c91da81472dd6
funtoo-media: ee35fa219404e223814ebd2ec790150001d21888
funtoo-overlay: a6ac02020ff5c87476b4e06787b804f9afe1ae70
funtoo-toolchain: f1a02cbac17370c1c4b57f59e2a261c1d2a9204c
funtoo-ldap: b97b3fd7ab9c0ef7ab7884a57c0d9f1609b6b999

commit 8715fdbd24c2489c65b6c05a921783fe522e3d02
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Jan 6 14:10:23 2015 +0000

glorious funtoo updates

merged:

bar-overlay: e29c88fad87f3aab32f058943dc1d4a409b4ae85
bliss-overlay: 10e4780332539b3607d2a669b73d59d601f2772f
squeezebox: cf7953988018d60d3638245b380406be494bd7ae
funtoo-deadbeef: 84848f7b806973a9b4ae4fc2eb4e546fddfc4442
funtoo-redhat: bbf9b3d93340f431421f38ec0f07395edd18ac1a
funtoo-wmfs: 9f97ae675241901f470402ac27373b11512982ea
vmware: b98ffa6d5d97a41a8b7be0a258a5adf92ed2de27
miramir: 87e12178bc3aea6707a4d8d9f2ed5cb08d4551b2
sera: 97b0bfd1f11402ba2185f151efa5fbd1641601fa
faustoo: 031fa6de6bd560b2d39c1f36a13114715296be4b
foo-overlay: 44af5419fabdb2f70469f6696330eac1c37b60d9
funtoo-plex: 053d584c4eeb8a92363b19249abe4f5c8bf1012b
causes: de5d9f094914b599b3aa98732b08bcb512af7056
sabayon-for-gentoo: 35bc7d64dfd938872da7c5f3528c4eba2da5990b
funtoo-gnome: 8cd441aad4cbe626e0152e75b9423c1d60cfb431
funtoo-mysql: 3b829e294896cf4ba866ef24865c91da81472dd6
funtoo-media: ee35fa219404e223814ebd2ec790150001d21888
funtoo-overlay: a6ac02020ff5c87476b4e06787b804f9afe1ae70
funtoo-toolchain: f1a02cbac17370c1c4b57f59e2a261c1d2a9204c
funtoo-ldap: b97b3fd7ab9c0ef7ab7884a57c0d9f1609b6b999

commit 668f46225333d57219eac74c3b3ac9d537271dc5
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Sat Nov 30 07:14:35 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: ff311c79867297bfc5806ee494080e65e635ec29
foo-overlay: cde51767054cbf2bb4bdaab8d0b04d8ea882bc6f
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: 60b2e7e5b2404d090c8bdd6afc03480be3c013f1
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: e90717e4ea166ea30062a480ece8a5ea7f03d00a

commit a5db724ed834ce6828898e4556ed7fa03e124bde
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Thu Nov 7 12:50:06 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: 0d8f7c9b044fba1ed3859e98c0e0d3e79df30b6c
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: 4fba6e56531ad6858cd0c50ce912e6b2c2cb0e73
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 6cc102a3c9fdadfd7c240ced476ea655d0ffb79a

commit 9bb9fefb3db6730220043f9191346cff95066ef2
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Thu Nov 7 06:54:59 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: f4e7742b10fb13f5228c6cca656a406a329e9503
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: 4fba6e56531ad6858cd0c50ce912e6b2c2cb0e73
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 6cc102a3c9fdadfd7c240ced476ea655d0ffb79a

commit 9fd84da1076e1e11fc64b80949e303c38a6a597e
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Thu Nov 7 00:50:22 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: f4e7742b10fb13f5228c6cca656a406a329e9503
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: 4fba6e56531ad6858cd0c50ce912e6b2c2cb0e73
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 6cc102a3c9fdadfd7c240ced476ea655d0ffb79a

commit c8de8e52f8ae89bd6bd5b57821589739725e111b
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Wed Nov 6 12:49:23 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: f4e7742b10fb13f5228c6cca656a406a329e9503
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: 4fba6e56531ad6858cd0c50ce912e6b2c2cb0e73
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 6cc102a3c9fdadfd7c240ced476ea655d0ffb79a

commit 85f3d59b8df6b247364e34fd2f5f8852a70919c1
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Nov 5 12:49:54 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: 31cf65aa938d27deadbdef9249f3edc7839089ab
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: 472681e4ab3d14257730c2a52ca3b48b394230fe
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 6cc102a3c9fdadfd7c240ced476ea655d0ffb79a

commit 0a38994d2ca67a1a18e276f59062c14622ab5591
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Nov 4 00:51:56 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: 31cf65aa938d27deadbdef9249f3edc7839089ab
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: ddbe32120aa2969eee028ecd7df9e8a985d11dae
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 5161024a12c070cc6df12e7218b9d397eef5effb

commit 494d09d942df05f24c52cd0bd0bdc10b3414369c
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Mon Nov 4 00:30:20 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: 31cf65aa938d27deadbdef9249f3edc7839089ab
foo-overlay: d242d6fcc74a431c59e7e1ba6e7458a9618861d6
bar-overlay: 09dbf39ca3130b8fa3d3c049518b56edd8dffcbe
mate: ddbe32120aa2969eee028ecd7df9e8a985d11dae
squeezebox: 3b7b8b97ca62d555c9e8456eb685627976cab6c2
sabayon-for-gentoo: 5161024a12c070cc6df12e7218b9d397eef5effb

commit e5d93e830ea7a2f7c42fcb56d8358aedd3da22a9
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Thu May 30 19:01:14 2013 -0600

glorious funtoo updates

merged:

funtoo-overlay: e522c8457fd83a81378506717bb893d22e81e392
foo-overlay: 581c89b1434714082413b9f9230cc95e8b5c05dc
bar-overlay: 2fa65d46049ae8c1993fd18b84095fed198a9449
flora: da07848913dd5f3d08d4b662120c643fe83796bd
mate: 2927f40b5b21d6e3965abb17c8392776d185511b
sabayon-for-gentoo: adaf54b404494f92b7e0e0b2ebf5d13e450f5264

commit b7fc7c22350b4cd44cff2377ff6944babefcb44f
Author: Daniel Robbins <drobbins@funtoo.org>
Date: Tue Feb 12 13:22:46 2013 -0700

glorious funtoo updates

merged:

funtoo-overlay: 3dd7e27649fceac1928082981549b7357d45a0c7
foo-overlay: 7d465f21ec9f45f44569f303afedcdd5750d1e16
bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
flora: cc31343a95ac9fd63bfc06fb6f27c86407f367fe
for-gentoo: 90a346fdb07c92601014bec211919700045e0a76