Commits

Branch selector

 master

User selector

All users

Datepicker

All time

Commit History

Commits on Apr 25, 2022

• Allow zdiff3 conflict style

  

  Rastislav Barlik

  committed
  ef0179e

  Copy full SHA for ef0179e

Commits on Dec 8, 2020

• Add a README for make-conflicts.sh to explain non-obvious points

  whiteinge

  committed
  69e9495

  Copy full SHA for 69e9495

Commits on Dec 28, 2019

• Merge pull request #23 from whiteinge/readme-tweaks

  Show description for 205e0e0
  whiteinge

  authored
  205e0e0

  Copy full SHA for 205e0e0

• Small README tweaks to emphasize a few points

  whiteinge

  committed
  bde9887

  Copy full SHA for bde9887

Commits on Jul 8, 2019

• Merge commit 'refs/pull/22/head' of github.com:whiteinge/diffconflicts

  whiteinge

  committed
  61765d0

  Copy full SHA for 61765d0

Commits on Jul 2, 2019

• Changed ordering of changesets in make-conflicts_hg.sh to actually match

  Show description for b10cd62
  

  Harald Klimach

  committed
  b10cd62

  Copy full SHA for b10cd62

Commits on Jun 30, 2019

• Remove quotes from base local and other, as hg already quotes them.

  

  Harald Klimach

  committed
  ca0770e

  Copy full SHA for ca0770e

• Make also ShowHistory working with Mercurial.

  Show description for 944186e
  

  Harald Klimach

  committed
  944186e

  Copy full SHA for 944186e

• Remove superfluous ticks in README.

  

  Harald Klimach

  committed
  7a44b37

  Copy full SHA for 7a44b37

• Added support for Mercurial to the plugin.

  Show description for a87c40e
  

  Harald Klimach

  committed
  a87c40e

  Copy full SHA for a87c40e

Commits on Jun 7, 2019

• Merge pull request #21 from alfunx/diff3-conflictStyle

  Show description for b097baa
  whiteinge

  authored
  b097baa

  Copy full SHA for b097baa

Commits on Jun 6, 2019

• Use slicing instead of trim() to remove newline

  alfunx

  committed
  a87b6c0

  Copy full SHA for a87b6c0

Commits on Jun 4, 2019

• Support diff3 conflictStyle

  Show description for 5e23411
  alfunx

  committed
  5e23411

  Copy full SHA for 5e23411

Commits on Jun 1, 2019

• Merge commit 'refs/pull/20/head' of github.com:whiteinge/diffconflicts

  whiteinge

  committed
  400c8bd

  Copy full SHA for 400c8bd

Commits on May 31, 2019

• Set filetype for right split (RCONFL)

  alfunx

  committed
  cd0066e

  Copy full SHA for cd0066e

Commits on Dec 2, 2018

• Add DiffConflictsWithHistory to split the diff view and open the history

  Show description for fb2a182
  whiteinge

  committed
  fb2a182

  Copy full SHA for fb2a182

• Merge commit 'refs/pull/16/head' of github.com:whiteinge/diffconflicts

  whiteinge

  committed
  1bda092

  Copy full SHA for 1bda092

Commits on Dec 1, 2018

• diff with history as another startup option

  

  John Moon

  committed
  5f57e25

  Copy full SHA for 5f57e25

Commits on Nov 30, 2018

• Avoid "Hit enter to continue" prompt if cmdheight is default

  Show description for 0cac3a8
  whiteinge

  committed
  0cac3a8

  Copy full SHA for 0cac3a8

• Update sample resolved file with the second stanza addition

  whiteinge

  committed
  3cffeb3

  Copy full SHA for 3cffeb3

• Fix incorrect left is LOCAL, right is REMOTE ordering

  Show description for 05263c1
  whiteinge

  committed
  05263c1

  Copy full SHA for 05263c1

Commits on Nov 13, 2018

• Merge pull request #12 from whiteinge/remove-vim-8-isms

  Show description for 0890619
  whiteinge

  authored
  0890619

  Copy full SHA for 0890619

Commits on Nov 6, 2018

• Replace getbufinfo() and lambda for ealier versions of Vim

  Show description for 9327ca8
  whiteinge

  committed
  9327ca8

  Copy full SHA for 9327ca8

Commits on Oct 30, 2018

• Merge pull request #10 from whiteinge/mixed-line-endings

  Show description for 16b0806
  whiteinge

  authored
  16b0806

  Copy full SHA for 16b0806

• Also match Windows line endings

  Show description for 1a337a9
  whiteinge

  committed
  1a337a9

  Copy full SHA for 1a337a9

Commits on Oct 23, 2018

• Merge pull request #9 from whiteinge/standalone-usage

  Show description for 7b9db25
  whiteinge

  authored
  7b9db25

  Copy full SHA for 7b9db25

• Update README to reflect stand-alone usage and call out installation

  whiteinge

  committed
  cce68d5

  Copy full SHA for cce68d5

• Whitespace fixes and abbreviation changes

  Show description for 5bca144
  whiteinge

  committed
  5bca144

  Copy full SHA for 5bca144

• Add error handling to showing history

  Show description for 6849ec1
  whiteinge

  committed
  6849ec1

  Copy full SHA for 6849ec1

Commits on Sep 17, 2018

• Merge pull request #7 from sudo-nice/master

  Show description for 2e7a142
  whiteinge

  authored
  2e7a142

  Copy full SHA for 2e7a142

• Put doc/tags into .gitignore

  sudo-nice

  committed
  ed88af6

  Copy full SHA for ed88af6

Commits on Sep 16, 2018

• Remove accidentally added tags file

  whiteinge

  committed
  9dcc13f

  Copy full SHA for 9dcc13f

Commits on Aug 1, 2018

• Merge pull request #6 from sudo-nice/master

  Show description for ee0ca0a
  whiteinge

  authored
  ee0ca0a

  Copy full SHA for ee0ca0a

• Define commands with <bang>

  Show description for 3bf1dda
  sudo-nice

  committed
  3bf1dda

  Copy full SHA for 3bf1dda

Commits on Jul 23, 2018

• Merge pull request #4 from tmc/master

  Show description for f1f3859
  whiteinge

  authored
  f1f3859

  Copy full SHA for f1f3859

Pagination

Previous

Next