diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-07 10:37:03 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 19:33:03 -0800 |
commit | 207dfa07919baba034291f1d5169f86272839d59 (patch) | |
tree | b177a070dc2902fa269865e8d41d3a8e825c4aef /merge-file.c | |
parent | 07fef5fc1599d11f5750ae2440e0da6616c297b8 (diff) | |
download | git-207dfa07919baba034291f1d5169f86272839d59.tar.gz |
Remove git-resolve.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions