diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-29 13:53:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-29 14:18:27 -0800 |
| commit | bf3e274873e56d7df25d60800c8d59a309e0d8c6 (patch) | |
| tree | 5f88497d70e46deae510f545b37784e9172bea12 /git-merge-recursive.py | |
| parent | e1355547fd30b21fbdc3fe4e576759683777c4ce (diff) | |
| download | git-bf3e274873e56d7df25d60800c8d59a309e0d8c6.tar.gz | |
applypatch: use "index" lines not "applies-to".
This matches the 3-way fallback used by applypatch to use
per-blob "index" lines, not "applies-to" tree object name, to
match what git-am does.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions