diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-05-23 19:23:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 21:37:30 -0700 |
| commit | 36f5b1f0c800a23b9755a0214c1c3250f34f2486 (patch) | |
| tree | 87abde66321dcd36c413d0a4855a8620f225fa2c /merge-index.c | |
| parent | 304dac15486b6d86d31aea1ca736c2c61f17e902 (diff) | |
| download | git-36f5b1f0c800a23b9755a0214c1c3250f34f2486.tar.gz git-36f5b1f0c800a23b9755a0214c1c3250f34f2486.tar.xz | |
git-svn: ignore expansion of svn:keywords
Unlike my earlier test patch, this also checks svn:eol-style and
makes sure it's applied to working copy updates. This is
definitely more correct than my original attempt at killing
keyword expansions, but I still haven't tested it enough to
know. Feedback would be much appreciated.
Also changed assert_svn_wc_clean() to only work on the svn
working copy. This requires a separate call to assert_tree() to
check wc integrity against git in preparation for another change
I'm planning.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions