Mercurial > pidgin.yaz
graph
-
merge of '029866e9fec9b313cae45784eb3e016ed27f0caa'Fri, 19 Oct 2007 17:28:40 +0000, by Luke Schierer
-
disapproval of revision 'ba01a475b5298205283309f3c0aaf3dd8d1a54f1'Fri, 19 Oct 2007 17:28:26 +0000, by Luke Schierer
-
applied changes from 0573c84391460ff90a7de830442aad5ffb6a0c5fFri, 19 Oct 2007 17:26:23 +0000, by Luke Schierer
-
This asked me to do a 3way merge in vim. Someone should check it.Fri, 19 Oct 2007 17:18:40 +0000, by Luke Schierer