X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=d1ee64539b2eb9d7c225a1f32ee43ad34e18fa3e;hp=1439184228b128177433ccd28562030de24eea39;hb=refs%2Fheads%2Fwip_alan_T5663_Gitlive_show_age_in_the;hpb=b54bcbb8389c624969d6eb0b8b720957ad785e02 diff --git a/GitRepo.vala b/GitRepo.vala index 14391842..d1ee6453 100644 --- a/GitRepo.vala +++ b/GitRepo.vala @@ -351,7 +351,7 @@ public class GitRepo : Object } GitMonitor.gitmonitor.start(); } - + public bool doMerge(string action, string ticket_id, string commit_message) {