![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Sep 2005 00:56:19 +0000 (17:56 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 11 Sep 2005 01:30:41 +0000 (18:30 -0700) | ||
| commit | 2276aa6c098a0337bc2bec49742e332bdd1b802c | |
| tree | bc43b357a46843c2efa0d1e3b4f55fe667b09824 | tree | snapshot |
| parent | 91063bbc6c4187184e94ebc4ab2b807e6d53cd0a | commit | diff |
Use Daniel's read-tree in the merge strategy 'resolve'.
And rename the one Linus kept calling stupid, 'stupid'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
And rename the one Linus kept calling stupid, 'stupid'.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Makefile | diff | blob | history | |
| git-merge-resolve.sh | diff | blob | history | |
| git-merge-stupid.sh | [new file with mode: 0755] | blob |
| git-merge.sh | diff | blob | history |