##// END OF EJS Templates
Merge with crew
Thomas Arendsen Hein -
r7173:37dd322a merge default
parent child Browse files
Show More
@@ -408,7 +408,6 b' quit:'
408 Py_XDECREF(nodemap);
408 Py_XDECREF(nodemap);
409 Py_XDECREF(cache);
409 Py_XDECREF(cache);
410 Py_XDECREF(rval);
410 Py_XDECREF(rval);
411 Py_XDECREF(data_obj);
412 return NULL;
411 return NULL;
413 }
412 }
414
413
@@ -6,8 +6,8 b" difflineplus = '#line#'"
6 difflineminus = '#line#'
6 difflineminus = '#line#'
7 difflineat = '#line#'
7 difflineat = '#line#'
8 diffline = '#line#'
8 diffline = '#line#'
9 changesetparent = '# Parent #node#'
9 changesetparent = '# Parent #node#'
10 changesetchild = '# Child #node#'
10 changesetchild = '# Child #node#'
11 filenodelink = ''
11 filenodelink = ''
12 fileline = '#line#'
12 fileline = '#line#'
13 diffblock = '#lines#'
13 diffblock = '#lines#'
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -416,7 +416,7 b' 200 Script output follows'
416 # User User Name <user@example.com>
416 # User User Name <user@example.com>
417 # Date 3 0
417 # Date 3 0
418 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
418 # Node ID cfa68229c1167443337266ebac453c73b1d5d16e
419 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83
419 # Parent bb948857c743469b22bbf51f7ec8112279ca5d83
420 xa
420 xa
421
421
422 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
422 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
General Comments 0
You need to be logged in to leave comments. Login now