Commits

Breadcrumbs

History for

onmaster

User selector

All users

Datepicker

All time

Commit History

Commits on Sep 28, 2021

• ConflictFileParser: use namespace

  sdottaka

  committed
  54e1460

Commits on May 16, 2020

• Use SPDX license identifier

  sdottaka

  committed
  a7e455a

Commits on Mar 19, 2017

• Support for diff3-style conflict file. bitbucket#61

  sdottaka

  committed
  77417ed

Commits on Feb 18, 2015

• - Replace include guards with #pragma once like winmerge2011

  Show description for 412419b
  sdottaka

  committed
  412419b

Commits on Nov 4, 2012

• - Remove MFC dependency

  Show description for d1617c2
  

  sdottaka

  committed
  d1617c2

Commits on Sep 8, 2012

• Remove MFC dependency

  

  sdottaka

  committed
  9c99737

Commits on Aug 29, 2008

• Patch #2081779 - Revised command line processing

  

  Jochen Tucht

  committed
  725fc6b

Commits on Jan 27, 2008

• PATCH: [ 1880423 ] Check if file is a conflict file before parsing

  kimmov

  committed
  594de8d

Commits on Jan 20, 2008

• PATCH: [ 1875129 ] Resolve conflict files

  kimmov

  committed
  c240e6b

Loading