]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f9bdf9b a757c64)
Merge branch 'jc/conflict-marker-size'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700)
commit3f3f8d9d09cdb6810e848d82583749e6080d2167
tree5f85fe29add68b68d375c0c74f0791f811f4692ctree | snapshot
parentf9bdf9b2102bd848c7a3eabff2ba5af63828de54commit | diff
parenta757c646ee78ae21c9e8ac66dcc52e361c15c7d2commit | diff
Merge branch 'jc/conflict-marker-size'

* jc/conflict-marker-size:
  diff --check: honor conflict-marker-size attribute
diff.c diff1 | diff2 | blob | history
t/t4017-diff-retval.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.