git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5bcde30 249c61a)
Merge branch 'js/merge-recursive'
authorJunio C Hamano <redacted>
Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700)
committerJunio C Hamano <redacted>
Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700)
* js/merge-recursive:
  merge-recursive: respect core.autocrlf when writing out the result
  Add testcase for merging in a CRLF repo

1  2 
builtin-merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc builtin-merge-recursive.c
Simple merge
git clone https://git.99rst.org/PROJECT