git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 326bea4 a757c64)
Merge branch 'jc/conflict-marker-size' into maint
authorJunio C Hamano <redacted>
Sat, 10 Apr 2010 05:38:34 +0000 (22:38 -0700)
committerJunio C Hamano <redacted>
Sat, 10 Apr 2010 05:38:34 +0000 (22:38 -0700)
* jc/conflict-marker-size:
  diff --check: honor conflict-marker-size attribute

1  2 
diff.c patch | diff1 | diff2 | blob | history
t/t4017-diff-retval.sh patch | diff1 | diff2 | blob | history

diff --cc diff.c
Simple merge
diff --cc t/t4017-diff-retval.sh
Simple merge
git clone https://git.99rst.org/PROJECT