]> git.proxmox.com Git - libgit2.git/commit - tests/network/remote/local.c
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb92b48 9b3e41f)
Merge pull request #3139 from ethomson/diff_conflicts
authorCarlos Martín Nieto <cmn@dwim.me>
Thu, 28 May 2015 16:45:57 +0000 (18:45 +0200)
committerCarlos Martín Nieto <cmn@dwim.me>
Thu, 28 May 2015 16:45:57 +0000 (18:45 +0200)
commitff8d635adbf1208927c7319178d29b0ed973a107
tree329dd098bfefdadf9115c4fa4cff4beddd67c696tree
parentfb92b48d541edde845e8cde176152f13592db71bcommit | diff
parent9b3e41f72bd9ab62e8d129713755c3a3a71359bccommit | diff
Merge pull request #3139 from ethomson/diff_conflicts

Include conflicts when diffing
CHANGELOG.md diff1 | diff2 | blob | history
The git library used in some Proxmox tool chains