| commit | 4353f386166d74fd96cb552900fc22f6df211c21 | |
| author | Fredrik Kuivinen <freku045@student.liu.se> | |
| Sun, 29 Jan 2006 12:16:08 +0000 (29 13:16 +0100) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 29 Jan 2006 23:00:42 +0000 (29 15:00 -0800) | ||
| tree | c63a81a9581166d6bae9f6d5cecc0db49f08dbf6 | treesnapshot (tar.gz zip) |
| parent | d37fd03222ad6b38aa6e237f5f191238c0544850 | commitdiff |
merge-recursive: Improve the error message printed when merge(1) isn't found.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge-recursive.py | diffblobblamehistory |