| commit | 7a1ad19e3d5e0974a287497b54101e3aacce4d63 | |
| author | Dan Carpenter <error27@gmail.com> | |
| Fri, 17 Oct 2008 21:56:14 +0000 (18 00:56 +0300) | ||
| committer | Dan Carpenter <error27@gmail.com> | |
| Fri, 17 Oct 2008 21:56:14 +0000 (18 00:56 +0300) | ||
| tree | a6fb481a8924cb9fc7b6133a90b1db44ae545c12 | treesnapshot (tar.gz zip) |
| parent | e9048e9b4effa7d96eab7776785ede30de30b17d | commitdiff |
Add a merge hook. Handle the situations like:
down();
if (foo) {
....
up();
return;
} else
up();
Signed-off-by: Dan Carpenter <error27@gmail.com>
down();
if (foo) {
....
up();
return;
} else
up();
Signed-off-by: Dan Carpenter <error27@gmail.com>
| check_template.c | diffblobblamehistory |