Commits

Branch selector

 nested

User selector

All users

Datepicker

All time

Commit History

Commits on Nov 21, 2021

• support for conflicts which have nested conflicts in their base

  Show description for 789c164
  yairchu

  committed
  789c164

  Copy full SHA for 789c164

Commits on Sep 30, 2020

• hlint police

  yairchu

  committed
  42f2673

  Copy full SHA for 42f2673

Commits on Sep 27, 2020

• Remove unused imports

  Show description for 29d011a
  yairchu

  committed
  29d011a

  Copy full SHA for 29d011a

Commits on Jun 11, 2020

• Remove dependency version upper bounds

  Show description for 933e654
  yairchu

  committed
  933e654

  Copy full SHA for 933e654

Commits on Jan 7, 2020

• Bump version: 1.0.8

  Peaker

  committed
  d36ec10

  Copy full SHA for d36ec10

• stack.yaml: Use Diff-0.4 from outside stackage

  Peaker

  committed
  f9e2e5e

  Copy full SHA for f9e2e5e

• Upgrade to Diff 0.4

  Peaker

  committed
  76a6aac

  Copy full SHA for 76a6aac

• Bump version: 1.0.6

  Peaker

  committed
  987261e

  Copy full SHA for 987261e

• .gitignore: add /dist-newstyle

  Peaker

  committed
  29b0072

  Copy full SHA for 29b0072

Commits on Dec 9, 2019

• Reduce conflicts when base is empty and lines on top or bottom match

  yairchu

  committed
  66e8148

  Copy full SHA for 66e8148

• bodyStrings traversal to individual strings

  yairchu

  committed
  fc98861

  Copy full SHA for fc98861

• Update stack resolver to recent lts

  yairchu

  committed
  703a156

  Copy full SHA for 703a156

Commits on May 14, 2019

• Add support for --untabify

  Peaker

  committed
  ecb279d

  Copy full SHA for ecb279d

• Refactor Resolution.NewContent

  Peaker

  committed
  ccc1edb

  Copy full SHA for ccc1edb

• mapM => traverse

  Peaker

  committed
  f40f0bb

  Copy full SHA for f40f0bb

• Remove redundant use of Monoid.Sum for literal nums

  Peaker

  committed
  fcc4500

  Copy full SHA for fcc4500

• Import Conflict qualified

  Peaker

  committed
  55df185

  Copy full SHA for 55df185

Commits on Nov 18, 2018

• extract resolveContent to Resolution module

  yairchu

  committed
  af53dbe

  Copy full SHA for af53dbe

• extract parseConflictsFromNumbersLines

  yairchu

  committed
  44f1e24

  Copy full SHA for 44f1e24

• rename c{Lines=>Body}{A,Base,B}

  yairchu

  committed
  12865db

  Copy full SHA for 12865db

Commits on Sep 23, 2018

• add options to merge a specific file

  Show description for 4d991cd
  yairchu

  committed
  4d991cd

  Copy full SHA for 4d991cd

• extract functions

  yairchu

  committed
  b243741

  Copy full SHA for b243741

Commits on Jul 24, 2018

• Bump version 1.0.5: Add description, stack.yaml is in extra-source-files

  Peaker

  committed
  6559ced

  Copy full SHA for 6559ced

• Bump version: 1.0.4

  Peaker

  committed
  fb272e3

  Copy full SHA for fb272e3

• lts-12.2

  Peaker

  committed
  99d4adb

  Copy full SHA for 99d4adb

Commits on May 6, 2018

• Update for compat with ghc 8.4

  Peaker

  committed
  4d521df

  Copy full SHA for 4d521df

• lts-10.5

  Peaker

  committed
  ef26d1e

  Copy full SHA for ef26d1e

Commits on Apr 15, 2018

• add Windows compatibility

  

  Tomer Chachamu

  authored and

  Peaker

  committed
  0d7aa48

  Copy full SHA for 0d7aa48

Commits on Apr 10, 2018

• Add .dir-locals.el

  Peaker

  committed
  c3214bf

  Copy full SHA for c3214bf

• Rename git-mediate.hs -> Main.hs

  Peaker

  committed
  78105ae

  Copy full SHA for 78105ae

Commits on Apr 9, 2018

• Show conflict headers

  Peaker

  committed
  6f054eb

  Copy full SHA for 6f054eb

• Add Paths_git_mediate to .cabal file

  Peaker

  committed
  8dc8c34

  Copy full SHA for 8dc8c34

Commits on Sep 1, 2017

• Update .ghci for cabal dev in haskell-mode

  Peaker

  committed
  ace7e2f

  Copy full SHA for ace7e2f

Commits on Aug 31, 2017

• Move sources into src dir

  Peaker

  committed
  aa4316d

  Copy full SHA for aa4316d

Commits on Jun 14, 2017

• Merge pull request #19 from sinelaw/version_1.0.3

  Show description for bc59c05
  yairchu

  authored
  bc59c05

  Copy full SHA for bc59c05

Pagination

Previous

Next